Skip to content

Commit b966d37

Browse files
adigiegmarcosb
authored andcommitted
Add ICDConfigurationData to app sources when ICD management server cluster is included (project-chip#37653)
* Fix ICD management server cluster dependecies Add ICDConfigurationData to app sources when ICD management server cluster is included in sample, but ICD support is disabled, e.g. lock-app on some platforms. Related to: project-chip#32321 Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> * Add TODO comments for project-chip#32321 Add TODO comments for issue related to ICD management server. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no> --------- Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent 14c9145 commit b966d37

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

src/app/chip_data_model.cmake

+10
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ include("${CHIP_ROOT}/src/data-model-providers/codegen/model.cmake")
2424
function(chip_configure_cluster APP_TARGET CLUSTER)
2525
file(GLOB CLUSTER_SOURCES "${CHIP_APP_BASE_DIR}/clusters/${CLUSTER}/*.cpp")
2626
target_sources(${APP_TARGET} PRIVATE ${CLUSTER_SOURCES})
27+
28+
# Add clusters dependencies
29+
if (CLUSTER STREQUAL "icd-management-server")
30+
# TODO(#32321): Remove after issue is resolved
31+
# Add ICDConfigurationData when ICD management server cluster is included,
32+
# but ICD support is disabled, e.g. lock-app on some platforms
33+
if(NOT CONFIG_CHIP_ENABLE_ICD_SUPPORT)
34+
target_sources(${APP_TARGET} PRIVATE ${CHIP_APP_BASE_DIR}/icd/server/ICDConfigurationData.cpp)
35+
endif()
36+
endif()
2737
endfunction()
2838

2939
#

src/app/clusters/icd-management-server/icd-management-server.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ bool emberAfIcdManagementClusterUnregisterClientCallback(CommandHandler * comman
466466
bool emberAfIcdManagementClusterStayActiveRequestCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
467467
const Commands::StayActiveRequest::DecodableType & commandData)
468468
{
469+
// TODO(#32321): Remove #if after issue is resolved
469470
// Note: We only need this #if statement for platform examples that enable the ICD management server without building the sample
470471
// as an ICD. Since this is not spec compliant, we should remove this #if statement once we stop compiling the ICD management
471472
// server in those examples.

0 commit comments

Comments
 (0)