b066ae906b
The use of `separate_arguments()` in extra_flags.cmake and unittest.cmake prevents the use of proper CMake lists. A CMake list can be specified on command line as: `-DMY_LIST="itemA;itemB;itemC"` Users are expected to be able to provide extra compile flags using CMake lists, like `-DEXTRA_CFLAGS="--flag1;--flag2"` but also using space separated lists, like: `-DEXTRA_CFLAGS="--flag1 --flag2"`. However, the way FLAGS was passed to separate_arguments() would result in a list being treated as extra arguments to the function and thus result in a CMake error. To allow the use of CMake lists, the length of the argument as a CMake list is tested. This ensures that when the argument contains a single `;` then the length is >1 and no conversion is needed. This allows a user to freely choose between the two forms: - `-DFLAGS="--flag1 --flag2"` - `-DFLAGS="--flag1;--flag2"` or when passing flags which themselves contains spaces, like: - `-DFLAGS="--flag1 \"val1 val2\""` - `-DFLAGS="--flag1;val1 val2"` Note that the extra escaped qouting is no longer needed for proper CMake lists as the `;` itself informs the system that spaces are to be kept as spaces. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
37 lines
1.2 KiB
CMake
37 lines
1.2 KiB
CMake
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
foreach(extra_flags EXTRA_CPPFLAGS EXTRA_LDFLAGS EXTRA_CFLAGS EXTRA_CXXFLAGS EXTRA_AFLAGS)
|
|
list(LENGTH ${extra_flags} flags_length)
|
|
if(flags_length LESS_EQUAL 1)
|
|
# A length of zero means no argument.
|
|
# A length of one means a single argument or a space separated list was provided.
|
|
# In both cases, it is safe to do a separate_arguments on the argument.
|
|
separate_arguments(${extra_flags}_AS_LIST UNIX_COMMAND ${${extra_flags}})
|
|
else()
|
|
# Already a proper list, no conversion needed.
|
|
set(${extra_flags}_AS_LIST "${${extra_flags}}")
|
|
endif()
|
|
endforeach()
|
|
|
|
if(EXTRA_CPPFLAGS)
|
|
zephyr_compile_options(${EXTRA_CPPFLAGS_AS_LIST})
|
|
endif()
|
|
if(EXTRA_LDFLAGS)
|
|
zephyr_link_libraries(${EXTRA_LDFLAGS_AS_LIST})
|
|
endif()
|
|
if(EXTRA_CFLAGS)
|
|
foreach(F ${EXTRA_CFLAGS_AS_LIST})
|
|
zephyr_compile_options($<$<COMPILE_LANGUAGE:C>:${F}>)
|
|
endforeach()
|
|
endif()
|
|
if(EXTRA_CXXFLAGS)
|
|
foreach(F ${EXTRA_CXXFLAGS_AS_LIST})
|
|
zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:${F}>)
|
|
endforeach()
|
|
endif()
|
|
if(EXTRA_AFLAGS)
|
|
foreach(F ${EXTRA_AFLAGS_AS_LIST})
|
|
zephyr_compile_options($<$<COMPILE_LANGUAGE:ASM>:${F}>)
|
|
endforeach()
|
|
endif()
|