Skip to content

Commit f1ce020

Browse files
[nrf toup] Add Kconfig to set CHIP_APP_ZAP_DIR
We need this Kconfig to set the proper CHIP_APP_ZAP_DIR if the custom location of the zap-generated files is used. Signed-off-by: Arkadiusz Balys <[email protected]>
1 parent 716258e commit f1ce020

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

config/nrfconnect/chip-module/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ if (NOT CHIP_ROOT)
4141
get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../.. REALPATH)
4242
endif()
4343

44-
if (NOT CHIP_APP_ZAP_DIR)
44+
if (CONFIG_CHIP_APP_ZAP_DIR)
45+
string(CONFIGURE "${CONFIG_CHIP_APP_ZAP_DIR}" app_zap_dir)
46+
get_filename_component(CHIP_APP_ZAP_DIR ${app_zap_dir} REALPATH)
47+
elseif (NOT CHIP_APP_ZAP_DIR)
4548
get_filename_component(CHIP_APP_ZAP_DIR ${CHIP_ROOT}/zzz_generated/app-common REALPATH)
4649
endif()
4750

config/nrfconnect/chip-module/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ config CHIP
2626

2727
if CHIP
2828

29+
config CHIP_APP_ZAP_DIR
30+
string "Path to the zap-generated directory"
31+
help
32+
It shall contain all the files generated by the zap-generate command.
33+
2934
config CHIP_NRF_PLATFORM
3035
bool
3136
default y

0 commit comments

Comments
 (0)