Skip to content

Commit 0108dd5

Browse files
tejlmandjukkar
authored andcommitted
[nrf fromtree] 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]> (cherry picked from commit 2c1eae2) (cherry picked from commit 7c1c2f4)
1 parent 79b1c3f commit 0108dd5

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
@@ -182,7 +182,7 @@ set(dts_files
182182
if(DTC_OVERLAY_FILE)
183183
zephyr_list(TRANSFORM DTC_OVERLAY_FILE NORMALIZE_PATHS
184184
OUTPUT_VARIABLE DTC_OVERLAY_FILE_AS_LIST)
185-
build_info(devicetree user-files VALUE ${DTC_OVERLAY_FILE_AS_LIST})
185+
build_info(devicetree user-files PATH ${DTC_OVERLAY_FILE_AS_LIST})
186186
list(APPEND
187187
dts_files
188188
${DTC_OVERLAY_FILE_AS_LIST}
@@ -192,7 +192,7 @@ endif()
192192
if(EXTRA_DTC_OVERLAY_FILE)
193193
zephyr_list(TRANSFORM EXTRA_DTC_OVERLAY_FILE NORMALIZE_PATHS
194194
OUTPUT_VARIABLE EXTRA_DTC_OVERLAY_FILE_AS_LIST)
195-
build_info(devicetree extra-user-files VALUE ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
195+
build_info(devicetree extra-user-files PATH ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})
196196
list(APPEND
197197
dts_files
198198
${EXTRA_DTC_OVERLAY_FILE_AS_LIST}
@@ -399,6 +399,6 @@ elseif(stderr)
399399
endif()
400400
endif(DTC)
401401

402-
build_info(devicetree files VALUE ${dts_files})
403-
build_info(devicetree include-dirs VALUE ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
404-
build_info(devicetree bindings-dirs VALUE ${DTS_ROOT_BINDINGS})
402+
build_info(devicetree files PATH ${dts_files})
403+
build_info(devicetree include-dirs PATH ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})
404+
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
@@ -98,13 +98,13 @@ set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt)
9898
if(CONF_FILE)
9999
string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)
100100
string(REPLACE " " ";" CONF_FILE_AS_LIST "${CONF_FILE_EXPANDED}")
101-
build_info(kconfig user-files VALUE ${CONF_FILE_AS_LIST})
101+
build_info(kconfig user-files PATH ${CONF_FILE_AS_LIST})
102102
endif()
103103

104104
if(EXTRA_CONF_FILE)
105105
string(CONFIGURE "${EXTRA_CONF_FILE}" EXTRA_CONF_FILE_EXPANDED)
106106
string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")
107-
build_info(kconfig extra-user-files VALUE ${EXTRA_CONF_FILE_AS_LIST})
107+
build_info(kconfig extra-user-files PATH ${EXTRA_CONF_FILE_AS_LIST})
108108
endif()
109109

110110
zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
@@ -360,7 +360,7 @@ endif()
360360
if(CREATE_NEW_DOTCONFIG)
361361
set(input_configs_flags --handwritten-input-configs)
362362
set(input_configs ${merge_config_files} ${FORCED_CONF_FILE})
363-
build_info(kconfig files VALUE ${input_configs})
363+
build_info(kconfig files PATH ${input_configs})
364364
else()
365365
set(input_configs ${DOTCONFIG} ${FORCED_CONF_FILE})
366366
endif()

0 commit comments

Comments
 (0)