alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_export_ver_during_reqs_expansion_v3.3' into 'release/v3.3'

Browse Source 
cmake: set IDF_VERSION_* variables at requirement expansion stage (v3.3)

See merge request espressif/esp-idf!14047
This commit is contained in:
Ivan Grokhotkov 2021-07-02 12:50:46 +00:00
commit 789914a405
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/ci/test_build_system_cmake.sh
View File

@ -130,6 +130,13 @@ function run_tests()
git checkout -- main/CMakeLists.txt git checkout -- main/CMakeLists.txt
rm main/main2.c 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" print_status "Moving BUILD_DIR_BASE out of tree"
clean_build_dir clean_build_dir
OUTOFTREE_BUILD=${TESTDIR}/alt_build OUTOFTREE_BUILD=${TESTDIR}/alt_build

1
tools/cmake/scripts/expand_requirements.cmake
View File

@ -32,6 +32,7 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
include("${IDF_PATH}/tools/cmake/utilities.cmake") include("${IDF_PATH}/tools/cmake/utilities.cmake")
include("${IDF_PATH}/tools/cmake/component_utils.cmake") include("${IDF_PATH}/tools/cmake/component_utils.cmake")
include("${IDF_PATH}/tools/cmake/version.cmake")
set(ESP_PLATFORM 1) set(ESP_PLATFORM 1)