Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/cmakeSpaceProcessForCOMPONENT_SRCS' into 'master'

Browse source 
add spaces2list for COMPONENT_SRCS

See merge request idf/esp-idf!4427
This commit is contained in:
Ivan Grokhotkov 2019-03-07 15:11:51 +08:00
commit 5f3bd38d3d
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/ci/test_build_system_cmake.sh
View file

@ -120,6 +120,14 @@ function run_tests()
version+=$(git describe --always --tags --dirty) version+=$(git describe --always --tags --dirty)
grep "${version}" log.log || failure "Project version should have a hash commit" grep "${version}" log.log || failure "Project version should have a hash commit"
print_status "Can set COMPONENT_SRCS with spaces"
clean_build_dir
touch main/main2.c
sed -i 's/^set(COMPONENT_SRCS.*/set(COMPONENT_SRCS "main.c main2.c")/' main/CMakeLists.txt
idf.py build || failure "Set COMPONENT_SRCS with spaces build failed"
git checkout -- main/CMakeLists.txt
rm main/main2.c
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/components.cmake
View file

@ -17,6 +17,7 @@ endfunction()
function(register_component) function(register_component)
get_filename_component(component_dir ${CMAKE_CURRENT_LIST_FILE} DIRECTORY) get_filename_component(component_dir ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
spaces2list(COMPONENT_SRCS)
spaces2list(COMPONENT_SRCDIRS) spaces2list(COMPONENT_SRCDIRS)
spaces2list(COMPONENT_ADD_INCLUDEDIRS) spaces2list(COMPONENT_ADD_INCLUDEDIRS)
spaces2list(COMPONENT_SRCEXCLUDE) spaces2list(COMPONENT_SRCEXCLUDE)