From 250b202d2e571a21cfe62c22558796a07dd7dfbd Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Thu, 3 Aug 2023 18:51:52 +0800 Subject: [PATCH] examples: Remove requirements for main components --- examples/blemesh_bridge/main/CMakeLists.txt | 5 +---- examples/controller/main/CMakeLists.txt | 5 +---- examples/esp-now_bridge_light/main/CMakeLists.txt | 5 +---- examples/generic_switch/main/CMakeLists.txt | 5 +---- examples/light/main/CMakeLists.txt | 5 +---- examples/light_switch/main/CMakeLists.txt | 5 +---- examples/refrigerator/main/CMakeLists.txt | 5 +---- examples/room_air_conditioner/main/CMakeLists.txt | 5 +---- examples/zap_light/main/CMakeLists.txt | 5 +---- examples/zigbee_bridge/main/CMakeLists.txt | 6 +----- 10 files changed, 10 insertions(+), 41 deletions(-) diff --git a/examples/blemesh_bridge/main/CMakeLists.txt b/examples/blemesh_bridge/main/CMakeLists.txt index 517328e96..ad75e6b67 100644 --- a/examples/blemesh_bridge/main/CMakeLists.txt +++ b/examples/blemesh_bridge/main/CMakeLists.txt @@ -1,9 +1,6 @@ -set(PRIV_REQUIRES_LIST device esp_matter app_bridge) - idf_component_register(SRC_DIRS "." PRIV_INCLUDE_DIRS "." - "${ESP_MATTER_PATH}/examples/common/blemesh_platform" - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + "${ESP_MATTER_PATH}/examples/common/blemesh_platform") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H") diff --git a/examples/controller/main/CMakeLists.txt b/examples/controller/main/CMakeLists.txt index 126989dbd..a181d0f54 100644 --- a/examples/controller/main/CMakeLists.txt +++ b/examples/controller/main/CMakeLists.txt @@ -1,8 +1,5 @@ -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console esp_matter_controller app_reset) -idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) +idf_component_register(SRC_DIRS ".") spiffs_create_partition_image(paa_cert ${CMAKE_SOURCE_DIR}/paa_cert FLASH_IN_PROJECT) diff --git a/examples/esp-now_bridge_light/main/CMakeLists.txt b/examples/esp-now_bridge_light/main/CMakeLists.txt index cf05ada1d..28da3b587 100644 --- a/examples/esp-now_bridge_light/main/CMakeLists.txt +++ b/examples/esp-now_bridge_light/main/CMakeLists.txt @@ -1,8 +1,5 @@ -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console app_bridge app_reset) - idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + PRIV_INCLUDE_DIRS ".") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H") diff --git a/examples/generic_switch/main/CMakeLists.txt b/examples/generic_switch/main/CMakeLists.txt index c95dff36a..28da3b587 100644 --- a/examples/generic_switch/main/CMakeLists.txt +++ b/examples/generic_switch/main/CMakeLists.txt @@ -1,8 +1,5 @@ -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console app_reset) - idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + PRIV_INCLUDE_DIRS ".") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H") diff --git a/examples/light/main/CMakeLists.txt b/examples/light/main/CMakeLists.txt index c95dff36a..28da3b587 100644 --- a/examples/light/main/CMakeLists.txt +++ b/examples/light/main/CMakeLists.txt @@ -1,8 +1,5 @@ -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console app_reset) - idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + PRIV_INCLUDE_DIRS ".") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H") diff --git a/examples/light_switch/main/CMakeLists.txt b/examples/light_switch/main/CMakeLists.txt index c95dff36a..28da3b587 100644 --- a/examples/light_switch/main/CMakeLists.txt +++ b/examples/light_switch/main/CMakeLists.txt @@ -1,8 +1,5 @@ -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console app_reset) - idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + PRIV_INCLUDE_DIRS ".") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H") diff --git a/examples/refrigerator/main/CMakeLists.txt b/examples/refrigerator/main/CMakeLists.txt index 890486731..6694b7133 100644 --- a/examples/refrigerator/main/CMakeLists.txt +++ b/examples/refrigerator/main/CMakeLists.txt @@ -2,8 +2,6 @@ set(SRC_DIRS_LIST "." "${MATTER_SDK_PATH}/examples/all-clusters-app/all-clusters-common/src" ) -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console app_reset) - set(INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/examples/all-clusters-app/all-clusters-common/include" ) set(exclude_srcs_list "${MATTER_SDK_PATH}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp" @@ -19,8 +17,7 @@ set(exclude_srcs_list "${MATTER_SDK_PATH}/examples/all-clusters-app/all-cluste idf_component_register(SRC_DIRS ${SRC_DIRS_LIST} EXCLUDE_SRCS ${exclude_srcs_list} INCLUDE_DIRS ${INCLUDE_DIRS_LIST} - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + PRIV_INCLUDE_DIRS ".") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H") diff --git a/examples/room_air_conditioner/main/CMakeLists.txt b/examples/room_air_conditioner/main/CMakeLists.txt index c95dff36a..28da3b587 100644 --- a/examples/room_air_conditioner/main/CMakeLists.txt +++ b/examples/room_air_conditioner/main/CMakeLists.txt @@ -1,8 +1,5 @@ -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console app_reset) - idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + PRIV_INCLUDE_DIRS ".") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H") diff --git a/examples/zap_light/main/CMakeLists.txt b/examples/zap_light/main/CMakeLists.txt index 57f31dd71..a8efe8189 100644 --- a/examples/zap_light/main/CMakeLists.txt +++ b/examples/zap_light/main/CMakeLists.txt @@ -1,8 +1,5 @@ -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console app_reset) - idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + PRIV_INCLUDE_DIRS ".") # We must set CHIP_ROOT to include esp32_codegen.cmake get_filename_component(CHIP_ROOT "${MATTER_SDK_PATH}" REALPATH) diff --git a/examples/zigbee_bridge/main/CMakeLists.txt b/examples/zigbee_bridge/main/CMakeLists.txt index 4a0c3d64e..28da3b587 100644 --- a/examples/zigbee_bridge/main/CMakeLists.txt +++ b/examples/zigbee_bridge/main/CMakeLists.txt @@ -1,9 +1,5 @@ -set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console app_bridge - esp-zboss-lib) - idf_component_register(SRC_DIRS "." - PRIV_INCLUDE_DIRS "." - PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + PRIV_INCLUDE_DIRS ".") set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")