Merge branch 'example/remove_main_requires' into 'main'

examples: Remove requirements for main components

See merge request app-frameworks/esp-matter!451
This commit is contained in:
Shu Chen
2023-08-17 14:01:39 +08:00
10 changed files with 10 additions and 41 deletions
+1 -4
View File
@@ -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")
+1 -4
View File
@@ -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)
@@ -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")
+1 -4
View File
@@ -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")
+1 -4
View File
@@ -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")
+1 -4
View File
@@ -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")
+1 -4
View File
@@ -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")
@@ -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")
+1 -4
View File
@@ -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)
+1 -5
View File
@@ -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")