separate IcdMonitorinTable in its own sourceset to fix build issues o…

…n examples that have the ICD cluster but not not enable chip_enable_icd_server
project-chip · Jul 12, 2023 · 276fa55 · 276fa55
1 parent d615a22
commit 276fa55
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -34,6 +34,7 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/lock"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/mode-support"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/icd"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/reporting"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/administrator-commissioning-server"

diff --git a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt
@@ -32,6 +32,7 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/icd"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/reporting"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/administrator-commissioning-server"

diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
@@ -267,8 +267,7 @@ template("chip_data_model") {
       } else if (cluster == "icd-management-server") {
         sources += [ "${_app_root}/clusters/${cluster}/${cluster}.cpp" ]
 
-        # need this public dep for the IcdMonitoringTable
-        public_deps += [ "${chip_root}/src/app/icd:manager-srcs" ]
+        public_deps += [ "${chip_root}/src/app/icd:monitoring-table" ]
       } else {
         sources += [ "${_app_root}/clusters/${cluster}/${cluster}.cpp" ]
       }

diff --git a/src/app/icd/BUILD.gn b/src/app/icd/BUILD.gn
@@ -23,12 +23,21 @@ source_set("manager-srcs") {
   sources = [
     "ICDManager.cpp",
     "ICDManager.h",
+  ]
+
+  public_deps = [
+    ":monitoring-table",
+    "${chip_root}/src/credentials:credentials",
+  ]
+}
+
+source_set("monitoring-table") {
+  sources = [
     "IcdMonitoringTable.cpp",
     "IcdMonitoringTable.h",
   ]
 
   public_deps = [
-    "${chip_root}/src/credentials:credentials",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/platform:platform",
   ]