patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

cmake: modules: Enclose name and path in quotes

Browse source 
Due to the fact that CMake only supports greedy regexes,
the ':' in a Windows path ('C:\...') was being matched leading
to an invalid split of the line. Quote both the name and the path
to avoid this issue.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2019-03-31 22:29:30 +02:00 committed by Kumar Gala
parent 52f6f6b960
commit 766edd449d
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -580,9 +580,12 @@ if(EXISTS ${CMAKE_BINARY_DIR}/zephyr_modules.txt)
file(STRINGS ${CMAKE_BINARY_DIR}/zephyr_modules.txt ZEPHYR_MODULES_TXT) file(STRINGS ${CMAKE_BINARY_DIR}/zephyr_modules.txt ZEPHYR_MODULES_TXT)
foreach(module ${ZEPHYR_MODULES_TXT}) foreach(module ${ZEPHYR_MODULES_TXT})
string(REGEX REPLACE "(.*):.*" "\\1" module_name ${module}) # Match "<name>":"<path>" for each line of file, each corresponding to
string(REGEX REPLACE ".*:(.*)" "\\1" module_path ${module}) # one module. The use of quotes is required due to CMake not supporting
message("Including module: ${module_name}") # lazy regexes (it supports greedy only).
string(REGEX REPLACE "\"(.*)\":\".*\"" "\\1" module_name ${module})
string(REGEX REPLACE "\".*\":\"(.*)\"" "\\1" module_path ${module})
message("Including module: ${module_name} in path: ${module_path}")
add_subdirectory(${module_path} ${CMAKE_BINARY_DIR}/${module_name}) add_subdirectory(${module_path} ${CMAKE_BINARY_DIR}/${module_name})
endforeach() endforeach()
endif() endif()

2
scripts/zephyr_module.py
View file

@ -90,7 +90,7 @@ def process_module(module, cmake_out=None, kconfig_out=None):
cmake_path = os.path.join(module, cmake_setting or 'zephyr') cmake_path = os.path.join(module, cmake_setting or 'zephyr')
cmake_file = os.path.join(cmake_path, 'CMakeLists.txt') cmake_file = os.path.join(cmake_path, 'CMakeLists.txt')
if os.path.isfile(cmake_file) and cmake_out is not None: if os.path.isfile(cmake_file) and cmake_out is not None:
cmake_out.write('{}:{}\n'.format(os.path.basename(module), cmake_out.write('\"{}\":\"{}\"\n'.format(os.path.basename(module),
os.path.abspath(cmake_path))) os.path.abspath(cmake_path)))
kconfig_file = os.path.join(module, kconfig_setting or 'zephyr/Kconfig') kconfig_file = os.path.join(module, kconfig_setting or 'zephyr/Kconfig')