From c454ec09e64c4e4840865a26511ce5ccbff8e401 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Thu, 26 Sep 2024 08:51:41 +0200 Subject: [PATCH] fix(wifi_remote): Fix CMake to use inherent IDF build vars IDF_VERSION_MAJOR, IDF_VERSION_MAJOR, rather than environmental variable {ESP_IDF_VERSION} --- components/esp_wifi_remote/CMakeLists.txt | 2 +- .../test/smoke_test/components/esp_hosted/CMakeLists.txt | 2 +- components/esp_wifi_remote/test/smoke_test/main/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_wifi_remote/CMakeLists.txt b/components/esp_wifi_remote/CMakeLists.txt index 759ffb5d38..c99baa128d 100644 --- a/components/esp_wifi_remote/CMakeLists.txt +++ b/components/esp_wifi_remote/CMakeLists.txt @@ -1,4 +1,4 @@ -set(IDF_VER_DIR "idf_v$ENV{ESP_IDF_VERSION}") +set(IDF_VER_DIR "idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}") if(NOT CONFIG_ESP_WIFI_ENABLED) set(src_wifi_is_remote esp_wifi_remote.c ${IDF_VER_DIR}/esp_wifi_with_remote.c esp_wifi_remote_net.c) diff --git a/components/esp_wifi_remote/test/smoke_test/components/esp_hosted/CMakeLists.txt b/components/esp_wifi_remote/test/smoke_test/components/esp_hosted/CMakeLists.txt index f37c59bd17..daa27d1f02 100644 --- a/components/esp_wifi_remote/test/smoke_test/components/esp_hosted/CMakeLists.txt +++ b/components/esp_wifi_remote/test/smoke_test/components/esp_hosted/CMakeLists.txt @@ -1,4 +1,4 @@ -set(IDF_VER_DIR "idf_v$ENV{ESP_IDF_VERSION}") +set(IDF_VER_DIR "idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}") idf_component_register(SRCS "${IDF_VER_DIR}/esp_hosted_mock.c" INCLUDE_DIRS "${IDF_VER_DIR}/include" "include" diff --git a/components/esp_wifi_remote/test/smoke_test/main/CMakeLists.txt b/components/esp_wifi_remote/test/smoke_test/main/CMakeLists.txt index fb72d4a0ad..fe54b8a66c 100644 --- a/components/esp_wifi_remote/test/smoke_test/main/CMakeLists.txt +++ b/components/esp_wifi_remote/test/smoke_test/main/CMakeLists.txt @@ -1,4 +1,4 @@ -set(IDF_VER_DIR "idf_v$ENV{ESP_IDF_VERSION}") +set(IDF_VER_DIR "idf_v${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}") idf_component_register(SRCS "smoke_test.c" "${IDF_VER_DIR}/all_wifi_calls.c"