From b82577168a5513e0cbdfc84d8a85bcef33da4be2 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 15 Dec 2020 20:53:19 +0100 Subject: [PATCH] cmake: set IDF_VERSION_* variables at requirement expansion stage Currently IDF_VERSION_* variables are not available to the component CMakeLists.txt files at the requirements expansion stage. This makes it harder to write component CMakeLists files compatible with different IDF versions. Include version.cmake from the requirements expansion script, add a build system test. --- tools/ci/test_build_system_cmake.sh | 7 +++++++ tools/cmake/scripts/expand_requirements.cmake | 1 + 2 files changed, 8 insertions(+) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index d99efd5a01..69d0ed36fb 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -130,6 +130,13 @@ function run_tests() git checkout -- main/CMakeLists.txt rm main/main2.c + print_status "Use IDF version variables in component CMakeLists.txt file" + clean_build_dir + (echo -e "if (NOT IDF_VERSION_MAJOR)\n message(FATAL_ERROR \"IDF version not set\")\n endif()" \ + && cat main/CMakeLists.txt) > main/CMakeLists.new && mv main/CMakeLists.new main/CMakeLists.txt + idf.py reconfigure || failure "Failed to use IDF_VERSION_MAJOR in component CMakeLists.txt" + git checkout -- main/CMakeLists.txt + print_status "Moving BUILD_DIR_BASE out of tree" clean_build_dir OUTOFTREE_BUILD=${TESTDIR}/alt_build diff --git a/tools/cmake/scripts/expand_requirements.cmake b/tools/cmake/scripts/expand_requirements.cmake index 26234853dd..11eabbb42f 100644 --- a/tools/cmake/scripts/expand_requirements.cmake +++ b/tools/cmake/scripts/expand_requirements.cmake @@ -32,6 +32,7 @@ cmake_minimum_required(VERSION 3.5) include("${IDF_PATH}/tools/cmake/utilities.cmake") include("${IDF_PATH}/tools/cmake/component_utils.cmake") +include("${IDF_PATH}/tools/cmake/version.cmake") set(ESP_PLATFORM 1)