Commit 2c1eae21 authored by Torsten Rasmussen's avatar Torsten Rasmussen Committed by Anas Nashif
Browse files

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: default avatarTorsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
parent a5cd46b8

cmake/modules/FindHostTools.cmake

+1 −1
Original line number Diff line number Diff line
@@ -116,4 +116,4 @@ set(HostTools_FOUND TRUE) 
set(HOSTTOOLS_FOUND TRUE)

build_info(toolchain name VALUE ${ZEPHYR_TOOLCHAIN_VARIANT})

string(TOUPPER ${ZEPHYR_TOOLCHAIN_VARIANT} zephyr_toolchain_variant_upper)

build_info(toolchain path VALUE "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")
 
build_info(toolchain path PATH "${${zephyr_toolchain_variant_upper}_TOOLCHAIN_PATH}")

cmake/modules/dts.cmake

+5 −5
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ set(dts_files 
if(DTC_OVERLAY_FILE)

  zephyr_list(TRANSFORM DTC_OVERLAY_FILE NORMALIZE_PATHS

              OUTPUT_VARIABLE DTC_OVERLAY_FILE_AS_LIST)

  build_info(devicetree user-files VALUE ${DTC_OVERLAY_FILE_AS_LIST})

  build_info(devicetree user-files PATH ${DTC_OVERLAY_FILE_AS_LIST})

  list(APPEND

    dts_files

    ${DTC_OVERLAY_FILE_AS_LIST}
@@ -198,7 +198,7 @@ endif() 
if(EXTRA_DTC_OVERLAY_FILE)

  zephyr_list(TRANSFORM EXTRA_DTC_OVERLAY_FILE NORMALIZE_PATHS

              OUTPUT_VARIABLE EXTRA_DTC_OVERLAY_FILE_AS_LIST)

  build_info(devicetree extra-user-files VALUE ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})

  build_info(devicetree extra-user-files PATH ${EXTRA_DTC_OVERLAY_FILE_AS_LIST})

  list(APPEND

    dts_files

    ${EXTRA_DTC_OVERLAY_FILE_AS_LIST}
@@ -416,6 +416,6 @@ elseif(stderr) 
endif()

endif(DTC)



build_info(devicetree files VALUE ${dts_files})

build_info(devicetree include-dirs VALUE ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})

build_info(devicetree bindings-dirs VALUE ${DTS_ROOT_BINDINGS})
 
build_info(devicetree files PATH ${dts_files})

build_info(devicetree include-dirs PATH ${DTS_ROOT_SYSTEM_INCLUDE_DIRS})

build_info(devicetree bindings-dirs PATH ${DTS_ROOT_BINDINGS})

cmake/modules/kconfig.cmake

+3 −3
Original line number Diff line number Diff line
@@ -95,13 +95,13 @@ set(PARSED_KCONFIG_SOURCES_TXT ${PROJECT_BINARY_DIR}/kconfig/sources.txt) 
if(CONF_FILE)

  string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)

  string(REPLACE " " ";" CONF_FILE_AS_LIST "${CONF_FILE_EXPANDED}")

  build_info(kconfig user-files VALUE ${CONF_FILE_AS_LIST})

  build_info(kconfig user-files PATH ${CONF_FILE_AS_LIST})

endif()



if(EXTRA_CONF_FILE)

  string(CONFIGURE "${EXTRA_CONF_FILE}" EXTRA_CONF_FILE_EXPANDED)

  string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")

  build_info(kconfig extra-user-files VALUE ${EXTRA_CONF_FILE_AS_LIST})

  build_info(kconfig extra-user-files PATH ${EXTRA_CONF_FILE_AS_LIST})

endif()



zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
@@ -356,7 +356,7 @@ endif() 
if(CREATE_NEW_DOTCONFIG)

  set(input_configs_flags --handwritten-input-configs)

  set(input_configs ${merge_config_files} ${FORCED_CONF_FILE})

  build_info(kconfig files VALUE ${input_configs})

  build_info(kconfig files PATH ${input_configs})

else()

  set(input_configs ${DOTCONFIG} ${FORCED_CONF_FILE})

endif()

CRA Git | Maintained and supported by SUSTech CRA and CCSE