Merge branch 'bugfix/cmakeSpaceProcessForCOMPONENT_SRCS' into 'master'
add spaces2list for COMPONENT_SRCS See merge request idf/esp-idf!4427
This commit is contained in:
commit
5f3bd38d3d
2 changed files with 12 additions and 3 deletions
|
@ -120,6 +120,14 @@ function run_tests()
|
|||
version+=$(git describe --always --tags --dirty)
|
||||
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"
|
||||
clean_build_dir
|
||||
OUTOFTREE_BUILD=${TESTDIR}/alt_build
|
||||
|
|
|
@ -17,6 +17,7 @@ endfunction()
|
|||
function(register_component)
|
||||
get_filename_component(component_dir ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
|
||||
|
||||
spaces2list(COMPONENT_SRCS)
|
||||
spaces2list(COMPONENT_SRCDIRS)
|
||||
spaces2list(COMPONENT_ADD_INCLUDEDIRS)
|
||||
spaces2list(COMPONENT_SRCEXCLUDE)
|
||||
|
|
Loading…
Reference in a new issue