espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/idf_build_process_default_v4.0' into 'release/v4.0'

Browse Source 
cmake: fix issue with setting defaults in idf_build_process (v4.0)

See merge request espressif/esp-idf!9713
This commit is contained in:
Angus Gratton
2020-08-10 09:19:38 +08:00
parent 91cf59981c 34f4b5a4d3
commit 03abf3b209
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/ci/test_build_system_cmake.sh
View File

@ -592,6 +592,19 @@ endmenu\n" >> ${IDF_PATH}/Kconfig;
|| failure "Version on worktree should have been properly resolved" || failure "Version on worktree should have been properly resolved"
git worktree remove ../esp-idf-template-test git worktree remove ../esp-idf-template-test
print_status "Defaults set properly for unspecified idf_build_process args"
pushd $IDF_PATH/examples/build_system/cmake/idf_as_lib
cp CMakeLists.txt CMakeLists.txt.bak
echo -e "\nidf_build_get_property(project_dir PROJECT_DIR)" >> CMakeLists.txt
echo -e "\nmessage(\"Project directory: \${project_dir}\")" >> CMakeLists.txt
mkdir build && cd build
cmake .. -DCMAKE_TOOLCHAIN_FILE=$IDF_PATH/tools/cmake/toolchain-esp32.cmake -DTARGET=esp32 &> log.txt
grep "Project directory: $IDF_PATH/examples/build_system/cmake/idf_as_lib" log.txt || failure "PROJECT_DIR default was not set"
cd ..
mv CMakeLists.txt.bak CMakeLists.txt
rm -rf build
popd
print_status "All tests completed" print_status "All tests completed"
if [ -n "${FAILURES}" ]; then if [ -n "${FAILURES}" ]; then
echo "Some failures were detected:" echo "Some failures were detected:"

2
tools/cmake/build.cmake
View File

@ -313,7 +313,7 @@ endmacro()
# #
macro(__build_set_default var default) macro(__build_set_default var default)
set(_var __${var}) set(_var __${var})
if(NOT "${_var}" STREQUAL "") if(NOT "${${_var}}" STREQUAL "")
idf_build_set_property(${var} "${${_var}}") idf_build_set_property(${var} "${${_var}}")
else() else()
idf_build_set_property(${var} "${default}") idf_build_set_property(${var} "${default}")