samples: matter: Add CHIP_APP_ZAP_DIR kconfig to the mfg sample

We need to use the new CONFIG_CHIP_APP_ZAP_DIR to set the proper
path to the custom zap-generated directory in Matter stack.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

samples/matter/common/cmake/data_model.cmake

@@ -4,12 +4,22 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
+string(CONFIGURE "${CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH}" zap_file_path)
+cmake_path(GET zap_file_path PARENT_PATH zap_parent_dir)
+
+# If we have a new app zap dir assigned we need to include zap parent dir to app target as well.
+if(CONFIG_CHIP_APP_ZAP_DIR)
+  string(CONFIGURE "${CONFIG_CHIP_APP_ZAP_DIR}" app_zap_dir)
+
+  # Override zap-generated directory.
+  get_filename_component(CHIP_APP_ZAP_DIR ${app_zap_dir} REALPATH CACHE)
+else()
+  string(CONFIGURE "${zap_parent_dir}/zap-generated" app_zap_dir)
+endif()
+
 include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/src/app/chip_data_model.cmake)
 
 function(ncs_configure_data_model)
-  string(CONFIGURE "${CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH}" zap_file_path)
-  cmake_path(GET zap_file_path PARENT_PATH zap_parent_dir)
-
   cmake_parse_arguments(ARG "" "" "EXTERNAL_CLUSTERS" ${ARGN})
 
   target_include_directories(matter-data-model
@@ -19,7 +29,7 @@ function(ncs_configure_data_model)
 
   chip_configure_data_model(matter-data-model
     BYPASS_IDL
-    GEN_DIR ${zap_parent_dir}/zap-generated
+    GEN_DIR ${app_zap_dir}
     ZAP_FILE ${zap_file_path}
     EXTERNAL_CLUSTERS ${ARG_EXTERNAL_CLUSTERS}
   )

samples/matter/manufacturer_specific/CMakeLists.txt

@@ -13,9 +13,6 @@ project(matter-manufacturer_specific)
 include(${ZEPHYR_NRF_MODULE_DIR}/samples/matter/common/cmake/zap_helpers.cmake)
 ncs_get_zap_parent_dir(ZAP_PARENT_DIR)
 
-# Override zap-generated directory.
-get_filename_component(CHIP_APP_ZAP_DIR ${ZAP_PARENT_DIR}/zap-generated REALPATH CACHE)
-
 # Enable GNU STD support.
 include(${ZEPHYR_CONNECTEDHOMEIP_MODULE_DIR}/config/nrfconnect/app/enable-gnu-std.cmake)
 

samples/matter/manufacturer_specific/prj.conf

@@ -15,6 +15,7 @@ CONFIG_CHIP_DEVICE_PRODUCT_NAME="Matter Manufacturer Specific"
 
 # Configure ZAP file name
 CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH="${APPLICATION_CONFIG_DIR}/src/default_zap/manufacturer_specific.zap"
+CONFIG_CHIP_APP_ZAP_DIR="${APPLICATION_CONFIG_DIR}/src/default_zap/zap-generated"
 
 # 32768 == 0x8000 (example Product ID added temporaly,
 # but it must be changed with proper PID from the list: