Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(cmake/toolchain): include utilities.cmake from correct build system version

Browse Source 
The toolchain files are using the remove_duplicated_flags function from
utilities.cmake. However, we want to avoid mixing utilities from cmakev1
and cmakev2. Use `IDF_BUILD_VER_TAG` to include utilities from the
currently used build system version.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
This commit is contained in:
Frantisek Hrbata
2025-11-04 07:48:13 +01:00
parent 38fc8380c5
commit 2daee9ba73
23 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cmake/toolchain-clang-esp32.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32c2.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32c3.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32c5.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32c6.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32c61.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32h2.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32h4.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32p4.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32s2.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-clang-esp32s3.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32c2.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32c3.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32c5.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32c6.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32c61.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32h2.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32h21.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32h4.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32p4.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32s2.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)
tools/cmake/toolchain-esp32s3.cmake
+1 -1
View File
@@ -1,4 +1,4 @@
include($ENV{IDF_PATH}/tools/cmake/utilities.cmake)
include($ENV{IDF_PATH}/tools/cmake${IDF_BUILD_VER_TAG}/utilities.cmake)
set(CMAKE_SYSTEM_NAME Generic)