@@ -133,14 +133,6 @@ function(chip_configure_data_model APP_TARGET)
133
133
${CHIP_APP_BASE_DIR} /icd/server/ICDConfigurationData.cpp
134
134
)
135
135
136
- # This is:
137
- # //src/app/common:cluster-objects
138
- #
139
- # TODO: ideally we would avoid duplication and would link gn-built items
140
- target_sources (${APP_TARGET} ${SCOPE}
141
- # ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
142
- )
143
-
144
136
chip_zapgen(${APP_TARGET} -zapgen
145
137
INPUT "${ARG_ZAP_FILE} "
146
138
GENERATOR "app-templates"
@@ -156,7 +148,6 @@ function(chip_configure_data_model APP_TARGET)
156
148
add_dependencies (${APP_TARGET} ${APP_TARGET} -zapgen)
157
149
158
150
target_sources (${APP_TARGET} ${SCOPE}
159
- # ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
160
151
${CHIP_APP_BASE_DIR} /reporting/reporting.cpp
161
152
${CHIP_APP_BASE_DIR} /util/attribute-storage.cpp
162
153
${CHIP_APP_BASE_DIR} /util/attribute-table.cpp
@@ -177,11 +168,13 @@ function(chip_configure_data_model APP_TARGET)
177
168
if (ARG_EXTERNAL_APP_COMMON)
178
169
target_sources (${APP_TARGET} ${SCOPE}
179
170
${ARG_EXTERNAL_APP_COMMON} /app-common/zap-generated /attributes/Accessors.cpp
171
+ # TODO: ideally we would avoid duplication and would link gn-built items
180
172
${ARG_EXTERNAL_APP_COMMON} /app-common/zap-generated /cluster-objects.cpp
181
173
)
182
174
else ()
183
175
target_sources (${APP_TARGET} ${SCOPE}
184
176
${CHIP_APP_BASE_DIR} /../../zzz_generated/app-common/app-common/zap-generated /attributes/Accessors.cpp
177
+ # TODO: ideally we would avoid duplication and would link gn-built items
185
178
${CHIP_APP_BASE_DIR} /../../zzz_generated/app-common/app-common/zap-generated /cluster-objects.cpp
186
179
)
187
180
endif ()
0 commit comments