cmake: fix multiple shield parsing
When multiple shields are defined, only the shield last in the -DSHIELD list gets defined in `.config`. This is due to too many backslashes used defining it for an env setting. Signed-off-by: Ryan McClelland <ryanmcclelland@fb.com>
This commit is contained in:
parent
f85e37ae2c
commit
fca38c38e5
1 changed files with 3 additions and 1 deletions
|
@ -90,6 +90,8 @@ endforeach()
|
|||
# A list of common environment settings used when invoking Kconfig during CMake
|
||||
# configure time or menuconfig and related build target.
|
||||
string(REPLACE ";" "\\\;" SHIELD_AS_LIST_ESCAPED "${SHIELD_AS_LIST}")
|
||||
# cmake commands are escaped differently
|
||||
string(REPLACE ";" "\\;" SHIELD_AS_LIST_ESCAPED_COMMAND "${SHIELD_AS_LIST}")
|
||||
|
||||
set(COMMON_KCONFIG_ENV_SETTINGS
|
||||
PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
|
||||
|
@ -251,7 +253,7 @@ endif()
|
|||
execute_process(
|
||||
COMMAND ${CMAKE_COMMAND} -E env
|
||||
${COMMON_KCONFIG_ENV_SETTINGS}
|
||||
SHIELD_AS_LIST=${SHIELD_AS_LIST_ESCAPED}
|
||||
SHIELD_AS_LIST=${SHIELD_AS_LIST_ESCAPED_COMMAND}
|
||||
${PYTHON_EXECUTABLE}
|
||||
${ZEPHYR_BASE}/scripts/kconfig/kconfig.py
|
||||
--zephyr-base=${ZEPHYR_BASE}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue