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_v4.1' into 'release/v4.1'

Browse Source 
cmake: set IDF_VERSION_* variables at requirement expansion stage (v4.1)

See merge request espressif/esp-idf!14045
This commit is contained in:
Zim Kalinowski 2021-08-12 21:41:51 +00:00
commit 2acf705460
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

@ -124,6 +124,13 @@ function run_tests()
version+=$(git describe --always --tags --dirty)
grep "${version}" log.log || failure "Project version should have a hash commit"
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

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

@ -12,6 +12,7 @@ endfunction()
idf_build_get_property(idf_path IDF_PATH)
include(${idf_path}/tools/cmake/utilities.cmake)
include(${idf_path}/tools/cmake/version.cmake)
function(__component_get_property var component_target property)
set(_property __component_${component_target}_${property})