From 2daee9ba73c40751950dabd80346fa42727f7e85 Mon Sep 17 00:00:00 2001 From: Frantisek Hrbata Date: Tue, 19 Aug 2025 09:54:27 +0200 Subject: [PATCH] feat(cmake/toolchain): include utilities.cmake from correct build system version 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 --- tools/cmake/toolchain-clang-esp32.cmake | 2 +- tools/cmake/toolchain-clang-esp32c2.cmake | 2 +- tools/cmake/toolchain-clang-esp32c3.cmake | 2 +- tools/cmake/toolchain-clang-esp32c5.cmake | 2 +- tools/cmake/toolchain-clang-esp32c6.cmake | 2 +- tools/cmake/toolchain-clang-esp32c61.cmake | 2 +- tools/cmake/toolchain-clang-esp32h2.cmake | 2 +- tools/cmake/toolchain-clang-esp32h4.cmake | 2 +- tools/cmake/toolchain-clang-esp32p4.cmake | 2 +- tools/cmake/toolchain-clang-esp32s2.cmake | 2 +- tools/cmake/toolchain-clang-esp32s3.cmake | 2 +- tools/cmake/toolchain-esp32.cmake | 2 +- tools/cmake/toolchain-esp32c2.cmake | 2 +- tools/cmake/toolchain-esp32c3.cmake | 2 +- tools/cmake/toolchain-esp32c5.cmake | 2 +- tools/cmake/toolchain-esp32c6.cmake | 2 +- tools/cmake/toolchain-esp32c61.cmake | 2 +- tools/cmake/toolchain-esp32h2.cmake | 2 +- tools/cmake/toolchain-esp32h21.cmake | 2 +- tools/cmake/toolchain-esp32h4.cmake | 2 +- tools/cmake/toolchain-esp32p4.cmake | 2 +- tools/cmake/toolchain-esp32s2.cmake | 2 +- tools/cmake/toolchain-esp32s3.cmake | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tools/cmake/toolchain-clang-esp32.cmake b/tools/cmake/toolchain-clang-esp32.cmake index 8710e635e27..edbee79c6cb 100644 --- a/tools/cmake/toolchain-clang-esp32.cmake +++ b/tools/cmake/toolchain-clang-esp32.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32c2.cmake b/tools/cmake/toolchain-clang-esp32c2.cmake index a2ed6b008ab..b23084a05cd 100644 --- a/tools/cmake/toolchain-clang-esp32c2.cmake +++ b/tools/cmake/toolchain-clang-esp32c2.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32c3.cmake b/tools/cmake/toolchain-clang-esp32c3.cmake index a2ed6b008ab..b23084a05cd 100644 --- a/tools/cmake/toolchain-clang-esp32c3.cmake +++ b/tools/cmake/toolchain-clang-esp32c3.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32c5.cmake b/tools/cmake/toolchain-clang-esp32c5.cmake index 41f9f6426da..16c004ab7f1 100644 --- a/tools/cmake/toolchain-clang-esp32c5.cmake +++ b/tools/cmake/toolchain-clang-esp32c5.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32c6.cmake b/tools/cmake/toolchain-clang-esp32c6.cmake index 41f9f6426da..16c004ab7f1 100644 --- a/tools/cmake/toolchain-clang-esp32c6.cmake +++ b/tools/cmake/toolchain-clang-esp32c6.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32c61.cmake b/tools/cmake/toolchain-clang-esp32c61.cmake index 41f9f6426da..16c004ab7f1 100644 --- a/tools/cmake/toolchain-clang-esp32c61.cmake +++ b/tools/cmake/toolchain-clang-esp32c61.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32h2.cmake b/tools/cmake/toolchain-clang-esp32h2.cmake index a2ed6b008ab..b23084a05cd 100644 --- a/tools/cmake/toolchain-clang-esp32h2.cmake +++ b/tools/cmake/toolchain-clang-esp32h2.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32h4.cmake b/tools/cmake/toolchain-clang-esp32h4.cmake index 21355e82151..3da3860bfbb 100644 --- a/tools/cmake/toolchain-clang-esp32h4.cmake +++ b/tools/cmake/toolchain-clang-esp32h4.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32p4.cmake b/tools/cmake/toolchain-clang-esp32p4.cmake index 59e328d70b4..69949aa38a7 100644 --- a/tools/cmake/toolchain-clang-esp32p4.cmake +++ b/tools/cmake/toolchain-clang-esp32p4.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32s2.cmake b/tools/cmake/toolchain-clang-esp32s2.cmake index 50c14bd72f2..68fcec9e943 100644 --- a/tools/cmake/toolchain-clang-esp32s2.cmake +++ b/tools/cmake/toolchain-clang-esp32s2.cmake @@ -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) diff --git a/tools/cmake/toolchain-clang-esp32s3.cmake b/tools/cmake/toolchain-clang-esp32s3.cmake index 289bbbc7178..2c3f4a0ac81 100644 --- a/tools/cmake/toolchain-clang-esp32s3.cmake +++ b/tools/cmake/toolchain-clang-esp32s3.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32.cmake b/tools/cmake/toolchain-esp32.cmake index 7c6759c8625..6b885c51630 100644 --- a/tools/cmake/toolchain-esp32.cmake +++ b/tools/cmake/toolchain-esp32.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32c2.cmake b/tools/cmake/toolchain-esp32c2.cmake index 87a50ea6566..a1bb1453947 100644 --- a/tools/cmake/toolchain-esp32c2.cmake +++ b/tools/cmake/toolchain-esp32c2.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32c3.cmake b/tools/cmake/toolchain-esp32c3.cmake index 87a50ea6566..a1bb1453947 100644 --- a/tools/cmake/toolchain-esp32c3.cmake +++ b/tools/cmake/toolchain-esp32c3.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32c5.cmake b/tools/cmake/toolchain-esp32c5.cmake index 597f7f0df96..f894ff3492c 100644 --- a/tools/cmake/toolchain-esp32c5.cmake +++ b/tools/cmake/toolchain-esp32c5.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32c6.cmake b/tools/cmake/toolchain-esp32c6.cmake index 7ca12da3b4d..9baa6ed890e 100644 --- a/tools/cmake/toolchain-esp32c6.cmake +++ b/tools/cmake/toolchain-esp32c6.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32c61.cmake b/tools/cmake/toolchain-esp32c61.cmake index 597f7f0df96..f894ff3492c 100644 --- a/tools/cmake/toolchain-esp32c61.cmake +++ b/tools/cmake/toolchain-esp32c61.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32h2.cmake b/tools/cmake/toolchain-esp32h2.cmake index 7ca12da3b4d..9baa6ed890e 100644 --- a/tools/cmake/toolchain-esp32h2.cmake +++ b/tools/cmake/toolchain-esp32h2.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32h21.cmake b/tools/cmake/toolchain-esp32h21.cmake index 7ca12da3b4d..9baa6ed890e 100644 --- a/tools/cmake/toolchain-esp32h21.cmake +++ b/tools/cmake/toolchain-esp32h21.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32h4.cmake b/tools/cmake/toolchain-esp32h4.cmake index 10cfa96f58c..9341e5b49b3 100644 --- a/tools/cmake/toolchain-esp32h4.cmake +++ b/tools/cmake/toolchain-esp32h4.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32p4.cmake b/tools/cmake/toolchain-esp32p4.cmake index af66eeb5065..500e44520ed 100644 --- a/tools/cmake/toolchain-esp32p4.cmake +++ b/tools/cmake/toolchain-esp32p4.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32s2.cmake b/tools/cmake/toolchain-esp32s2.cmake index 2e5fce33ddb..9f061a35e55 100644 --- a/tools/cmake/toolchain-esp32s2.cmake +++ b/tools/cmake/toolchain-esp32s2.cmake @@ -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) diff --git a/tools/cmake/toolchain-esp32s3.cmake b/tools/cmake/toolchain-esp32s3.cmake index 0210ecf0327..238d6992df4 100644 --- a/tools/cmake/toolchain-esp32s3.cmake +++ b/tools/cmake/toolchain-esp32s3.cmake @@ -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)