espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples: remove redundant C++ standard setting in main component

Browse Source 
All examples already set the C++ standard in the project-level
CMakeLists.txt. The main component redundantly sets it again.
As per the ESP-IDF C++ support guide, a component should only
override the C++ version if it intends to use a different one.
We want to keep a consistent version across the project, so
the redundant setting is removed.
This commit is contained in:
Shubham Patil
2025-08-13 11:00:47 +05:30
parent 780388a14f
commit a5a1a4d7bd
22 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/all_device_types_app/main/CMakeLists.txt
-1
View File
@@ -18,7 +18,6 @@ idf_component_register(SRC_DIRS ${SRC_DIRS_LIST}
INCLUDE_DIRS ${INCLUDE_DIRS_LIST}
LDFRAGMENTS "${ldfragments}")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
if(CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S3)
examples/bridge_apps/blemesh_bridge/main/CMakeLists.txt
-1
View File
@@ -3,5 +3,4 @@ idf_component_register(SRC_DIRS "."
"${ESP_MATTER_PATH}/examples/common/blemesh_platform"
"${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/bridge_apps/bridge_cli/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/bridge_apps/esp-now_bridge_light/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/bridge_apps/zigbee_bridge/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/controller/main/CMakeLists.txt
-1
View File
@@ -7,5 +7,4 @@ if(CONFIG_SPIFFS_ATTESTATION_TRUST_STORE)
spiffs_create_partition_image(paa_cert ${CMAKE_SOURCE_DIR}/paa_cert FLASH_IN_PROJECT)
endif()
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/demo/badge/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/door_lock/main/CMakeLists.txt
+1 -2
View File
@@ -2,5 +2,4 @@ idf_component_register(SRC_DIRS "." "./lock"
PRIV_INCLUDE_DIRS
"." "./lock" "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/generic_switch/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/icd_app/main/CMakeLists.txt
-1
View File
@@ -1,7 +1,6 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
if (CONFIG_IDF_TARGET_ESP32C5)
examples/light/main/CMakeLists.txt
-1
View File
@@ -5,5 +5,4 @@ if (CONFIG_ENABLE_SET_CERT_DECLARATION_API)
target_add_binary_data(${COMPONENT_TARGET} "certification_declaration/certification_declaration.der" BINARY)
endif()
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/light_network_prov/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "." "./network_prov_scheme"
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils" "./network_prov_scheme")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/light_switch/main/CMakeLists.txt
-1
View File
@@ -7,5 +7,4 @@ endif()
idf_component_register(SRC_DIRS ${SRC_DIRS_LIST}
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/managed_component_light/main/CMakeLists.txt
+1 -2
View File
@@ -2,5 +2,4 @@ idf_component_register(SRC_DIRS "."
INCLUDE_DIRS "."
PRIV_INCLUDE_DIRS "../../common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/mfg_test_app/main/CMakeLists.txt
-1
View File
@@ -5,5 +5,4 @@ idf_component_register(SRC_DIRS "."
PRIV_REQUIRES ${PRIV_REQUIRES_LIST}
EMBED_FILES "paa_cert.der")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/multiple_on_off_plugin_units/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/ota_provider/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS ".")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/refrigerator/main/CMakeLists.txt
-1
View File
@@ -10,5 +10,4 @@ idf_component_register(SRCS ${SRC_LIST}
INCLUDE_DIRS ${INCLUDE_DIRS_LIST}
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/room_air_conditioner/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "." "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/sensors/main/CMakeLists.txt
-1
View File
@@ -1,5 +1,4 @@
idf_component_register(SRC_DIRS "." "drivers"
PRIV_INCLUDE_DIRS "." "drivers" "${ESP_MATTER_PATH}/examples/common/utils")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/thread_border_router/main/CMakeLists.txt
-1
View File
@@ -2,5 +2,4 @@ idf_component_register(SRC_DIRS "."
INCLUDE_DIRS "."
LDFRAGMENTS "linker.lf")
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
examples/zap_light/main/CMakeLists.txt
+1 -2
View File
@@ -8,12 +8,11 @@ idf_component_register(SRC_DIRS "."
# We must set CHIP_ROOT to include chip_data_model.cmake
get_filename_component(CHIP_ROOT "${MATTER_SDK_PATH}" REALPATH)
include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
chip_configure_data_model(${COMPONENT_LIB}
chip_configure_data_model(${COMPONENT_LIB}
ZAP_FILE ${CHIP_ROOT}/examples/lighting-app/lighting-common/lighting-app.zap)
add_prebuilt_library(matterlib "${CMAKE_BINARY_DIR}/esp-idf/chip/lib/libCHIP.a"
REQUIRES esp_matter main)
target_link_libraries(${COMPONENT_LIB} INTERFACE matterlib)
set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")