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

cmake: add spaces2list for COMPONENT_SRCS

Browse Source 
According to ESP-IDF Cmake build system document, COMPONENT_SRCS should support using spaces to sperate source files.

Closes https://github.com/espressif/esp-idf/issues/3130
This commit is contained in:
morris 2019-03-06 12:18:38 +08:00
parent ea0a1c3030
commit 9297b07a97
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/ci/test_build_system_cmake.sh
View File

@ -107,19 +107,27 @@ function run_tests()
idf.py build || failure "Failed to rebuild with changed app version" idf.py build || failure "Failed to rebuild with changed app version"
assert_rebuilt ${APP_BINS} assert_rebuilt ${APP_BINS}
assert_not_rebuilt ${BOOTLOADER_BINS} esp-idf/esp32/libesp32.a assert_not_rebuilt ${BOOTLOADER_BINS} esp-idf/esp32/libesp32.a
print_status "Re-building does not change app.bin" print_status "Re-building does not change app.bin"
take_build_snapshot take_build_snapshot
idf.py build idf.py build
assert_not_rebuilt ${APP_BINS} ${BOOTLOADER_BINS} esp-idf/esp32/libesp32.a assert_not_rebuilt ${APP_BINS} ${BOOTLOADER_BINS} esp-idf/esp32/libesp32.a
rm -f ${TESTDIR}/template/version.txt rm -f ${TESTDIR}/template/version.txt
print_status "Get the version of app from git describe. Project is not inside IDF and do not have a tag only a hash commit." print_status "Get the version of app from git describe. Project is not inside IDF and do not have a tag only a hash commit."
idf.py build >> log.log || failure "Failed to build" idf.py build >> log.log || failure "Failed to build"
version="Project version: " version="Project version: "
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

3
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)
@ -175,4 +176,4 @@ endfunction()
function(component_get_target var component) function(component_get_target var component)
get_property(prefix GLOBAL PROPERTY __IDF_COMPONENTS_PREFIX) get_property(prefix GLOBAL PROPERTY __IDF_COMPONENTS_PREFIX)
set(${var} ${prefix}_${component} PARENT_SCOPE) set(${var} ${prefix}_${component} PARENT_SCOPE)
endfunction() endfunction()