Skip to content

Commit f36ffd6

Browse files
authored
cleanup cmake data model build rules / remove ARG_INCLUDE_SERVER (#35542)
* Separate out the cmake logic a bit. Still somewhat broken through as the codegen data model is not built * Fix build and remove INCLUDE_SERVER cmake argument
1 parent 3299927 commit f36ffd6

File tree

43 files changed

+35
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+35
-64
lines changed

config/openiotsdk/cmake/chip.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ function(chip_add_data_model target scope model_name)
7474
include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
7575
chip_configure_data_model(${target}
7676
SCOPE ${scope}
77-
INCLUDE_SERVER
7877
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../${model_name}-common/${model_name}-app.zap
7978
)
8079
endfunction()

examples/air-purifier-app/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ add_library(
162162
)
163163

164164
chip_configure_data_model(chip_main
165-
INCLUDE_SERVER
166165
ZAP_FILE ${matter_example_path}/../air-purifier-common/air-purifier-app.zap
167166
)
168167

examples/air-quality-sensor-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ target_sources(app PRIVATE
5353
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5454

5555
chip_configure_data_model(app
56-
INCLUDE_SERVER
5756
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../air-quality-sensor-common/air-quality-sensor-app.zap
5857
)
5958

examples/all-clusters-app/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ add_library(
212212
)
213213

214214
chip_configure_data_model(chip_main
215-
INCLUDE_SERVER
216215
ZAP_FILE ${matter_example_path}/../all-clusters-common/all-clusters-app.zap
217216
)
218217

examples/all-clusters-app/mbed/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ target_sources(${APP_TARGET} PRIVATE
8787
)
8888

8989
chip_configure_data_model(${APP_TARGET}
90-
INCLUDE_SERVER
9190
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../all-clusters-common/all-clusters-app.zap
9291
)
9392

examples/all-clusters-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ target_sources(app PRIVATE
7777
${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
7878

7979
chip_configure_data_model(app
80-
INCLUDE_SERVER
8180
ZAP_FILE ${ALL_CLUSTERS_COMMON_DIR}/all-clusters-app.zap
8281
)
8382

examples/all-clusters-app/nxp/zephyr/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ if(CONFIG_CHIP_OTA_REQUESTOR)
8282
endif()
8383

8484
chip_configure_data_model(app
85-
INCLUDE_SERVER
8685
ZAP_FILE ${ALL_CLUSTERS_COMMON_DIR}/all-clusters-app.zap
8786
)
8887

examples/all-clusters-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ target_sources(app PRIVATE
7676
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
7777

7878
chip_configure_data_model(app
79-
INCLUDE_SERVER
8079
ZAP_FILE ${ALL_CLUSTERS_COMMON_DIR}/all-clusters-app.zap
8180
)
8281

examples/all-clusters-minimal-app/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ add_library(
147147
)
148148

149149
chip_configure_data_model(chip_main
150-
INCLUDE_SERVER
151150
ZAP_FILE ${matter_example_path}/../all-clusters-common/all-clusters-minimal-app.zap
152151
)
153152

examples/all-clusters-minimal-app/mbed/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ target_sources(${APP_TARGET} PRIVATE
6565
)
6666

6767
chip_configure_data_model(${APP_TARGET}
68-
INCLUDE_SERVER
6968
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../all-clusters-common/all-clusters-minimal-app.zap
7069
)
7170

examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ target_sources(app PRIVATE
5555
${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
5656

5757
chip_configure_data_model(app
58-
INCLUDE_SERVER
5958
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../all-clusters-common/all-clusters-minimal-app.zap
6059
)
6160

examples/all-clusters-minimal-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ target_sources(app PRIVATE
5555
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5656

5757
chip_configure_data_model(app
58-
INCLUDE_SERVER
5958
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../all-clusters-common/all-clusters-minimal-app.zap
6059
)
6160

examples/bridge-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ target_sources(app PRIVATE
5252
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5353

5454
chip_configure_data_model(app
55-
INCLUDE_SERVER
5655
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../bridge-common/bridge-app.zap
5756
)
5857

examples/chef/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ add_library(
5151
)
5252

5353
chip_configure_data_model(chip_main
54-
INCLUDE_SERVER
5554
ZAP_FILE ${matter_example_path}/../devices/${SAMPLE_NAME}.zap
5655
)
5756

examples/chef/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ target_sources(app PRIVATE
106106

107107
message(STATUS ${CHEF}/devices/${CONFIG_CHEF_DEVICE_TYPE}.zap)
108108
chip_configure_data_model(app
109-
INCLUDE_SERVER
110109
ZAP_FILE ${CHEF}/devices/${CONFIG_CHEF_DEVICE_TYPE}.zap
111110
)
112111

examples/chef/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ target_sources(app PRIVATE
7777
message(STATUS ${CHEF}/devices/${SAMPLE_NAME}.zap)
7878

7979
chip_configure_data_model(app
80-
INCLUDE_SERVER
8180
ZAP_FILE ${CHEF}/devices/${SAMPLE_NAME}.zap
8281
)
8382

examples/contact-sensor-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ target_sources(app PRIVATE
5151
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5252

5353
chip_configure_data_model(app
54-
INCLUDE_SERVER
5554
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../contact-sensor-common/contact-sensor-app.zap
5655
)
5756

examples/laundry-washer-app/nxp/zephyr/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ if(CONFIG_CHIP_OTA_REQUESTOR)
8484
endif()
8585

8686
chip_configure_data_model(app
87-
INCLUDE_SERVER
8887
ZAP_FILE ${ALL_CLUSTERS_COMMON_DIR}/../../laundry-washer-app/nxp/zap/laundry-washer-app.zap
8988
)
9089

examples/light-switch-app/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ add_library(
173173
)
174174

175175
chip_configure_data_model(chip_main
176-
INCLUDE_SERVER
177176
ZAP_FILE ${matter_example_path}/../light-switch-common/light-switch-app.zap
178177
)
179178

examples/light-switch-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,5 @@ if(CONFIG_MCUMGR_TRANSPORT_BT)
6464
endif()
6565

6666
chip_configure_data_model(app
67-
INCLUDE_SERVER
6867
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../light-switch-common/light-switch-app.zap
6968
)

examples/light-switch-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ target_sources(app PRIVATE
5252
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5353

5454
chip_configure_data_model(app
55-
INCLUDE_SERVER
5655
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../light-switch-common/light-switch-app.zap
5756
)
5857

examples/lighting-app/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ add_library(
166166
)
167167

168168
chip_configure_data_model(chip_main
169-
INCLUDE_SERVER
170169
ZAP_FILE ${matter_example_path}/../lighting-common/lighting-app.zap
171170
)
172171

examples/lighting-app/mbed/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ target_sources(${APP_TARGET} PRIVATE
6262
)
6363

6464
chip_configure_data_model(${APP_TARGET}
65-
INCLUDE_SERVER
6665
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lighting-common/lighting-app.zap
6766
)
6867

examples/lighting-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ target_sources(app PRIVATE
5555
${NRFCONNECT_COMMON}/util/PWMDevice.cpp)
5656

5757
chip_configure_data_model(app
58-
INCLUDE_SERVER
5958
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lighting-common/lighting-app.zap
6059
)
6160

examples/lighting-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ target_sources(app PRIVATE
5252
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5353

5454
chip_configure_data_model(app
55-
INCLUDE_SERVER
5655
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lighting-common/lighting-app.zap
5756
)
5857

examples/lit-icd-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ target_sources(app PRIVATE
5050
${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
5151

5252
chip_configure_data_model(app
53-
INCLUDE_SERVER
5453
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lit-icd-common/lit-icd-server-app.zap
5554
)
5655

examples/lock-app/mbed/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ target_sources(${APP_TARGET} PRIVATE
6262
)
6363

6464
chip_configure_data_model(${APP_TARGET}
65-
INCLUDE_SERVER
6665
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lock-common/lock-app.zap
6766
)
6867

examples/lock-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ target_sources(app PRIVATE
5252
${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
5353

5454
chip_configure_data_model(app
55-
INCLUDE_SERVER
5655
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lock-common/lock-app.zap
5756
)
5857

examples/lock-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ target_sources(app PRIVATE
5353
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5454

5555
chip_configure_data_model(app
56-
INCLUDE_SERVER
5756
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lock-common/lock-app.zap
5857
)
5958

examples/ota-requestor-app/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ add_library(
3939
)
4040

4141
chip_configure_data_model(chip_main
42-
INCLUDE_SERVER
4342
ZAP_FILE ${matter_example_path}/../ota-requestor-common/ota-requestor-app.zap
4443
)
4544

examples/ota-requestor-app/mbed/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ target_sources(${APP_TARGET} PRIVATE
6060
)
6161

6262
chip_configure_data_model(${APP_TARGET}
63-
INCLUDE_SERVER
6463
ZAP_FILE ${CHIP_ROOT}/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
6564
)
6665

examples/ota-requestor-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ target_sources(app PRIVATE
5151
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5252

5353
chip_configure_data_model(app
54-
INCLUDE_SERVER
5554
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../ota-requestor-common/ota-requestor-app.zap
5655
)
5756

examples/pump-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ target_sources(app PRIVATE
5252
${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
5353

5454
chip_configure_data_model(app
55-
INCLUDE_SERVER
5655
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../pump-common/pump-app.zap
5756
)
5857

examples/pump-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ target_sources(app PRIVATE
5050
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5151

5252
chip_configure_data_model(app
53-
INCLUDE_SERVER
5453
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../pump-common/pump-app.zap
5554
)
5655

examples/pump-controller-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ target_sources(app PRIVATE
5252
${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
5353

5454
chip_configure_data_model(app
55-
INCLUDE_SERVER
5655
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../pump-controller-common/pump-controller-app.zap
5756
)
5857

examples/pump-controller-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ target_sources(app PRIVATE
5050
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5151

5252
chip_configure_data_model(app
53-
INCLUDE_SERVER
5453
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../pump-controller-common/pump-controller-app.zap
5554
)
5655

examples/smoke-co-alarm-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ target_sources(app PRIVATE
5151
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5252

5353
chip_configure_data_model(app
54-
INCLUDE_SERVER
5554
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../smoke-co-alarm-common/smoke-co-alarm-app.zap
5655
)
5756

examples/temperature-measurement-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ target_sources(app PRIVATE
5353
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5454

5555
chip_configure_data_model(app
56-
INCLUDE_SERVER
5756
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../temperature-measurement-common/temperature-measurement.zap
5857
)
5958

examples/thermostat/nxp/zephyr/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ if(CONFIG_CHIP_OTA_REQUESTOR)
8484
endif()
8585

8686
chip_configure_data_model(app
87-
INCLUDE_SERVER
8887
ZAP_FILE ${ALL_CLUSTERS_COMMON_DIR}/../../thermostat/nxp/zap/thermostat_matter_wifi.zap
8988
)
9089

examples/thermostat/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ target_sources(app PRIVATE
5353
${TELINK_COMMON}/zephyr_ext/zephyr_ws2812.c)
5454

5555
chip_configure_data_model(app
56-
INCLUDE_SERVER
5756
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../thermostat-common/thermostat.zap
5857
)
5958

examples/window-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ target_sources(app PRIVATE
5555
${NRFCONNECT_COMMON}/util/PWMDevice.cpp)
5656

5757
chip_configure_data_model(app
58-
INCLUDE_SERVER
5958
ZAP_FILE ${WIN_APP_COMMON_DIR}/window-app.zap
6059
)
6160

examples/window-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ target_sources(app PRIVATE
5353
)
5454

5555
chip_configure_data_model(app
56-
INCLUDE_SERVER
5756
ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../common/window-app.zap
5857
)
5958

0 commit comments

Comments
 (0)