Skip to content

Commit 32de914

Browse files
Remove C++ 17 workarounds for esp32. (#37778)
These fail to compile currently with an error like: ``` CMake Error at CMakeLists.txt:83 (get_target_property): get_target_property() called with non-existent target "pw_build.cpp17._public_config". CMake Error at CMakeLists.txt:86 (set_target_properties): set_target_properties Can not find target to add properties to: pw_build.cpp17._public_config ``` The target of `_public_config` seems private so we should not mess with it. Tested that RPC compiles locally. Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent 128e41a commit 32de914

File tree

7 files changed

+0
-26
lines changed

7 files changed

+0
-26
lines changed

config/ameba/chip.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ endif (matter_enable_persistentstorage_audit)
117117

118118
# Build RPC
119119
if (matter_enable_rpc)
120-
#string(APPEND CHIP_GN_ARGS "remove_default_configs = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]\n")
121120
string(APPEND CHIP_GN_ARGS "chip_build_pw_rpc_lib = true\n")
122121
string(APPEND CHIP_GN_ARGS "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"\n")
123122
string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"\n")

examples/energy-management-app/esp32/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
8080
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
8181
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
8282

83-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
84-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
85-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
86-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
8783
endif(CONFIG_ENABLE_PW_RPC)

examples/lighting-app/esp32/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
8080
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
8181
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
8282

83-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
84-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
85-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
86-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
8783
endif(CONFIG_ENABLE_PW_RPC)

examples/lock-app/esp32/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
6161
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
6262
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
6363

64-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
65-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
66-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
67-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
6864
endif(CONFIG_ENABLE_PW_RPC)
6965

7066
flashing_script()

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

-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
6161
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
6262
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
6363

64-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
65-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
66-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
67-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
6864
endif(CONFIG_ENABLE_PW_RPC)
6965

7066

examples/pigweed-app/esp32/CMakeLists.txt

-5
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
6262
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
6363
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
6464

65-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
66-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
67-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
68-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
69-
7065
flashing_script(DEPENDS "${CMAKE_CURRENT_LIST_DIR}/echo_test_config.yml" "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/examples/pigweed-app/mobly_tests/echo_test.py")

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

-4
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,4 @@ add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
6363
add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
6464
add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
6565

66-
get_target_property(_target_cxx_flags pw_build.cpp17._public_config INTERFACE_COMPILE_OPTIONS)
67-
list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
68-
list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
69-
set_target_properties(pw_build.cpp17._public_config PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
7066
endif(CONFIG_ENABLE_PW_RPC)

0 commit comments

Comments
 (0)