cmake: Add support for file suffixes
Adds support for configuration files to use file suffixes Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
parent
5b6c585673
commit
ef251048e4
2 changed files with 10 additions and 4 deletions
|
@ -27,6 +27,9 @@ include_guard(GLOBAL)
|
|||
|
||||
include(extensions)
|
||||
|
||||
# Merge in variables from other sources (e.g. sysbuild)
|
||||
zephyr_get(FILE_SUFFIX SYSBUILD GLOBAL)
|
||||
|
||||
zephyr_get(APPLICATION_CONFIG_DIR)
|
||||
if(DEFINED APPLICATION_CONFIG_DIR)
|
||||
string(CONFIGURE ${APPLICATION_CONFIG_DIR} APPLICATION_CONFIG_DIR)
|
||||
|
@ -41,7 +44,7 @@ endif()
|
|||
|
||||
zephyr_get(CONF_FILE SYSBUILD LOCAL)
|
||||
if(NOT DEFINED CONF_FILE)
|
||||
zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR} KCONF CONF_FILE NAMES "prj.conf" REQUIRED)
|
||||
zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR} KCONF CONF_FILE NAMES "prj.conf" SUFFIX ${FILE_SUFFIX} REQUIRED)
|
||||
zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR}/boards KCONF CONF_FILE)
|
||||
else()
|
||||
string(CONFIGURE "${CONF_FILE}" CONF_FILE_EXPANDED)
|
||||
|
@ -70,12 +73,12 @@ To change CONF_FILE, use the CONF_FILE variable." ${CONF_FILE_FORCE_CACHE})
|
|||
# The CONF_FILE variable is now set to its final value.
|
||||
zephyr_boilerplate_watch(CONF_FILE)
|
||||
|
||||
zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR}/boards DTS APP_BOARD_DTS)
|
||||
zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR}/boards DTS APP_BOARD_DTS SUFFIX ${FILE_SUFFIX})
|
||||
|
||||
zephyr_get(DTC_OVERLAY_FILE SYSBUILD LOCAL)
|
||||
if(NOT DEFINED DTC_OVERLAY_FILE)
|
||||
zephyr_file(CONF_FILES ${APPLICATION_CONFIG_DIR} DTS DTC_OVERLAY_FILE
|
||||
NAMES "${APP_BOARD_DTS};${BOARD}.overlay;app.overlay")
|
||||
NAMES "${APP_BOARD_DTS};${BOARD}.overlay;app.overlay" SUFFIX ${FILE_SUFFIX})
|
||||
endif()
|
||||
|
||||
set(DTC_OVERLAY_FILE ${DTC_OVERLAY_FILE} CACHE STRING "If desired, you can \
|
||||
|
@ -87,6 +90,9 @@ DTC_OVERLAY_FILE=\"dts1.overlay dts2.overlay\"")
|
|||
# The DTC_OVERLAY_FILE variable is now set to its final value.
|
||||
zephyr_boilerplate_watch(DTC_OVERLAY_FILE)
|
||||
|
||||
# Watch the FILE_SUFFIX variable for changes too
|
||||
zephyr_boilerplate_watch(FILE_SUFFIX)
|
||||
|
||||
zephyr_get(EXTRA_CONF_FILE SYSBUILD LOCAL VAR EXTRA_CONF_FILE OVERLAY_CONFIG MERGE REVERSE)
|
||||
zephyr_get(EXTRA_DTC_OVERLAY_FILE SYSBUILD LOCAL MERGE REVERSE)
|
||||
zephyr_get(DTS_EXTRA_CPPFLAGS SYSBUILD LOCAL MERGE REVERSE)
|
||||
|
|
|
@ -84,7 +84,7 @@ if(EXTRA_CONF_FILE)
|
|||
string(REPLACE " " ";" EXTRA_CONF_FILE_AS_LIST "${EXTRA_CONF_FILE_EXPANDED}")
|
||||
endif()
|
||||
|
||||
zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files)
|
||||
zephyr_file(CONF_FILES ${BOARD_EXTENSION_DIRS} KCONF board_extension_conf_files SUFFIX ${FILE_SUFFIX})
|
||||
|
||||
# DTS_ROOT_BINDINGS is a semicolon separated list, this causes
|
||||
# problems when invoking kconfig_target since semicolon is a special
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue