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

cmake: adding $<SEMICOLON> instead of space on zephyr_get_compile_<type>

Browse source 
The current zephyr_get_compile_<type> flags returns compile / include
flags based on generator expressions.

But they also included a space.

This have the unintended side-effect that when the properties are
fetched into another variable and later appended to lists in order to
finally be used in a CMake target function / custom command, then CMake
in some cases will quote the string, creating a quoted argument like:
"arg0 arg1 arg2: instead of individual arguments like: "arg0" "arg1"
"arg2".

By using $<SEMICOLON>, then arguments are seperated correctly.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2020-11-20 10:56:28 +01:00 committed by Anas Nashif
parent 0e9c98c4f5
commit 8275d39d4d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/extensions.cmake
View file

@ -202,7 +202,7 @@ function(zephyr_get_include_directories_for_lang lang i)
string(REPLACE ";" "$<SEMICOLON>" genexp_output_list "${output_list}")
if(NOT ARGN)
set(result_output_list "-I$<JOIN:${genexp_output_list}, -I>")
set(result_output_list "-I$<JOIN:${genexp_output_list},$<SEMICOLON>-I>")
elseif(args_STRIP_PREFIX)
# The list has no prefix, so don't add it.
set(result_output_list ${output_list})
@ -217,7 +217,7 @@ function(zephyr_get_system_include_directories_for_lang lang i)
process_flags(${lang} flags output_list)
string(REPLACE ";" "$<SEMICOLON>" genexp_output_list "${output_list}")
set(result_output_list "$<$<BOOL:${genexp_output_list}>:-isystem$<JOIN:${genexp_output_list}, -isystem>>")
set(result_output_list "$<$<BOOL:${genexp_output_list}>:-isystem$<JOIN:${genexp_output_list},$<SEMICOLON>-isystem>>")
set(${i} ${result_output_list} PARENT_SCOPE)
endfunction()
@ -227,7 +227,7 @@ function(zephyr_get_compile_definitions_for_lang lang i)
process_flags(${lang} flags output_list)
string(REPLACE ";" "$<SEMICOLON>" genexp_output_list "${output_list}")
set(result_output_list "-D$<JOIN:${genexp_output_list}, -D>")
set(result_output_list "-D$<JOIN:${genexp_output_list},$<SEMICOLON>-D>")
set(${i} ${result_output_list} PARENT_SCOPE)
endfunction()
@ -237,7 +237,7 @@ function(zephyr_get_compile_options_for_lang lang i)
process_flags(${lang} flags output_list)
string(REPLACE ";" "$<SEMICOLON>" genexp_output_list "${output_list}")
set(result_output_list " $<JOIN:${genexp_output_list}, >")
set(result_output_list "$<JOIN:${genexp_output_list},$<SEMICOLON>>")
set(${i} ${result_output_list} PARENT_SCOPE)
endfunction()

2
cmake/linker/arcmwdt/target.cmake
View file

@ -26,7 +26,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
set(linker_script_dep "")
endif()
zephyr_get_include_directories_for_lang(C current_includes "$<SEMICOLON>")
zephyr_get_include_directories_for_lang(C current_includes)
get_filename_component(base_name ${CMAKE_CURRENT_BINARY_DIR} NAME)
get_property(current_defines GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES)

2
cmake/linker/ld/target.cmake
View file

@ -26,7 +26,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
set(linker_script_dep "")
endif()
zephyr_get_include_directories_for_lang(C current_includes "$<SEMICOLON>")
zephyr_get_include_directories_for_lang(C current_includes)
get_filename_component(base_name ${CMAKE_CURRENT_BINARY_DIR} NAME)
get_property(current_defines GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES)