Skip to content

Commit 2c1eae2

Browse files
tejlmandnashif
authored andcommitted
cmake: update build_info() calls to use PATH argument
Update build_info() calls to use `PATH` argument when values passed to `build_info()` are user specified and thereby might use native path separator, such as a single `\`. Signed-off-by: Torsten Rasmussen <[email protected]>
1 parent a5cd46b commit 2c1eae2

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

cmake/modules/FindHostTools.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ set(HostTools_FOUND TRUE)
116116
set(HOSTTOOLS_FOUND TRUE)
117117
build_info(toolchain name VALUE ${ZEPHYR_TOOLCHAIN_VARIANT})
118118
string(TOUPPER ${ZEPHYR_TOOLCHAIN_VARIANT} zephyr_toolchain_variant_upper)
119-
build_info(toolchain path VALUE "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")
119+
build_info(toolchain path PATH "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")

cmake/modules/dts.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ set(dts_files
188188
if(DTC_OVERLAY_FILE)
189189
zephyr_list(TRANSFORM DTC_OVERLAY_FILE NORMALIZE_PATHS
190190
OUTPUT_VARIABLE DTC_OVERLAY_FILE_AS_LIST)
191-
build_info(devicetree user-files VALUE ${DTC_OVERLAY_FILE_AS_LIST})
191+
build_info(devicetree user-files PATH ${DTC_OVERLAY_FILE_AS_LIST})
192192
list(APPEND
193193
dts_files
194194
${DTC_OVERLAY_FILE_AS_LIST}
@@ -198,7 +198,7 @@ endif()
198198
if(EXTRA_DTC_OVERLAY_FILE)
199199
zephyr_list(TRANSFORM EXTRA_DTC_OVERLAY_FILE NORMALIZE_PATHS
200200
OUTPUT_VARIABLE EXTRA_DTC_OVERLAY_FILE_AS_LIST)
201-
build_info(devicetree extra-user-files VALUE ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
201+
build_info(devicetree extra-user-files PATH ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
202202
list(APPEND
203203
dts_files
204204
${EXTRA_DTC_OVERLAY_FILE_AS_LIST}
@@ -416,6 +416,6 @@ elseif(stderr)
416416
endif()
417417
endif(DTC)
418418

419-
build_info(devicetree files VALUE ${dts_files})
420-
build_info(devicetree include-dirs VALUE ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
421-
build_info(devicetree bindings-dirs VALUE ${DTS_ROOT_BINDINGS})
419+
build_info(devicetree files PATH ${dts_files})
420+
build_info(devicetree include-dirs PATH ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
421+
build_info(devicetree bindings-dirs PATH ${DTS_ROOT_BINDINGS})

cmake/modules/kconfig.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt)
9595
if(CONF_FILE)
9696
string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)
9797
string(REPLACE " " ";" CONF_FILE_AS_LIST "${CONF_FILE_EXPANDED}")
98-
build_info(kconfig user-files VALUE ${CONF_FILE_AS_LIST})
98+
build_info(kconfig user-files PATH ${CONF_FILE_AS_LIST})
9999
endif()
100100

101101
if(EXTRA_CONF_FILE)
102102
string(CONFIGURE "${EXTRA_CONF_FILE}" EXTRA_CONF_FILE_EXPANDED)
103103
string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")
104-
build_info(kconfig extra-user-files VALUE ${EXTRA_CONF_FILE_AS_LIST})
104+
build_info(kconfig extra-user-files PATH ${EXTRA_CONF_FILE_AS_LIST})
105105
endif()
106106

107107
zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
@@ -356,7 +356,7 @@ endif()
356356
if(CREATE_NEW_DOTCONFIG)
357357
set(input_configs_flags --handwritten-input-configs)
358358
set(input_configs ${merge_config_files} ${FORCED_CONF_FILE})
359-
build_info(kconfig files VALUE ${input_configs})
359+
build_info(kconfig files PATH ${input_configs})
360360
else()
361361
set(input_configs ${DOTCONFIG} ${FORCED_CONF_FILE})
362362
endif()

0 commit comments

Comments
 (0)