From 9ae780091f167b8b26355a934f02978e540d842e Mon Sep 17 00:00:00 2001 From: Yakun Xu Date: Tue, 4 May 2021 13:50:41 +0800 Subject: [PATCH] [cmake] set cxx and c standard once (#6551) --- CMakeLists.txt | 2 + examples/platforms/cc2538/CMakeLists.txt | 7 ---- .../platforms/efr32/efr32mg1/efr32mg1.cmake | 6 --- .../platforms/efr32/efr32mg12/efr32mg12.cmake | 6 --- .../platforms/efr32/efr32mg13/efr32mg13.cmake | 6 --- .../platforms/efr32/efr32mg21/efr32mg21.cmake | 6 --- .../nrf528xx/nrf52811/nrf52811.cmake | 6 --- .../nrf528xx/nrf52833/nrf52833.cmake | 6 --- .../nrf528xx/nrf52840/nrf52840.cmake | 6 --- examples/platforms/simulation/CMakeLists.txt | 7 ---- examples/platforms/utils/CMakeLists.txt | 7 ---- src/cli/ftd.cmake | 7 ---- src/cli/mtd.cmake | 7 ---- src/core/ftd.cmake | 7 ---- src/core/mtd.cmake | 7 ---- src/core/radio.cmake | 7 ---- src/lib/hdlc/CMakeLists.txt | 7 ---- src/lib/spinel/CMakeLists.txt | 7 ---- src/lib/url/CMakeLists.txt | 7 ---- src/ncp/ftd.cmake | 7 ---- src/ncp/mtd.cmake | 7 ---- src/ncp/radio.cmake | 7 ---- src/posix/cli.cmake | 7 ---- src/posix/daemon.cmake | 14 ------- src/posix/platform/CMakeLists.txt | 7 ---- tests/unit/CMakeLists.txt | 37 ------------------- third_party/silabs/cmake/mbedtls.cmake | 6 --- 27 files changed, 2 insertions(+), 211 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c302072f4..4b6cc5df4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,8 @@ set(OT_EXTERNAL_MBEDTLS "" CACHE STRING "Specify external mbedtls library") option(OT_MBEDTLS_THREADING "enable mbedtls threading" OFF) add_library(ot-config INTERFACE) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_C_STANDARD 99) message(STATUS "OpenThread Source Directory: ${PROJECT_SOURCE_DIR}") diff --git a/examples/platforms/cc2538/CMakeLists.txt b/examples/platforms/cc2538/CMakeLists.txt index c69d1e576..f8ed5f212 100644 --- a/examples/platforms/cc2538/CMakeLists.txt +++ b/examples/platforms/cc2538/CMakeLists.txt @@ -55,13 +55,6 @@ add_library(openthread-cc2538 $ ) -set_target_properties( - openthread-cc2538 - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-cc2538 PRIVATE ot-config diff --git a/examples/platforms/efr32/efr32mg1/efr32mg1.cmake b/examples/platforms/efr32/efr32mg1/efr32mg1.cmake index 39e5da530..e15da5a3f 100644 --- a/examples/platforms/efr32/efr32mg1/efr32mg1.cmake +++ b/examples/platforms/efr32/efr32mg1/efr32mg1.cmake @@ -57,12 +57,6 @@ add_library(openthread-efr32mg1 $ ) -set_target_properties(openthread-efr32mg1 - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-efr32mg1 PUBLIC ${EFR32_COMMON_3RD_LIBS} diff --git a/examples/platforms/efr32/efr32mg12/efr32mg12.cmake b/examples/platforms/efr32/efr32mg12/efr32mg12.cmake index ad73e5f9a..5df8cc80d 100644 --- a/examples/platforms/efr32/efr32mg12/efr32mg12.cmake +++ b/examples/platforms/efr32/efr32mg12/efr32mg12.cmake @@ -66,12 +66,6 @@ add_library(openthread-efr32mg12 $ ) -set_target_properties(openthread-efr32mg12 - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-efr32mg12 PUBLIC ${EFR32_COMMON_3RD_LIBS} diff --git a/examples/platforms/efr32/efr32mg13/efr32mg13.cmake b/examples/platforms/efr32/efr32mg13/efr32mg13.cmake index c94490173..fbca4186e 100644 --- a/examples/platforms/efr32/efr32mg13/efr32mg13.cmake +++ b/examples/platforms/efr32/efr32mg13/efr32mg13.cmake @@ -57,12 +57,6 @@ add_library(openthread-efr32mg13 $ ) -set_target_properties(openthread-efr32mg13 - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-efr32mg13 PUBLIC ${EFR32_COMMON_3RD_LIBS} diff --git a/examples/platforms/efr32/efr32mg21/efr32mg21.cmake b/examples/platforms/efr32/efr32mg21/efr32mg21.cmake index eaaffdd49..253076be8 100644 --- a/examples/platforms/efr32/efr32mg21/efr32mg21.cmake +++ b/examples/platforms/efr32/efr32mg21/efr32mg21.cmake @@ -60,12 +60,6 @@ add_library(openthread-efr32mg21 $ ) -set_target_properties(openthread-efr32mg21 - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-efr32mg21 PUBLIC ${EFR32_COMMON_3RD_LIBS} diff --git a/examples/platforms/nrf528xx/nrf52811/nrf52811.cmake b/examples/platforms/nrf528xx/nrf52811/nrf52811.cmake index ffe837e6b..9b8d654c3 100644 --- a/examples/platforms/nrf528xx/nrf52811/nrf52811.cmake +++ b/examples/platforms/nrf528xx/nrf52811/nrf52811.cmake @@ -82,12 +82,6 @@ add_library(openthread-nrf52811-sdk $ ) -set_target_properties(openthread-nrf52811 openthread-nrf52811-transport openthread-nrf52811-sdk - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-nrf52811 PUBLIC ${OT_MBEDTLS} diff --git a/examples/platforms/nrf528xx/nrf52833/nrf52833.cmake b/examples/platforms/nrf528xx/nrf52833/nrf52833.cmake index 659559acd..a02ae6e24 100644 --- a/examples/platforms/nrf528xx/nrf52833/nrf52833.cmake +++ b/examples/platforms/nrf528xx/nrf52833/nrf52833.cmake @@ -95,12 +95,6 @@ add_library(openthread-nrf52833-softdevice-sdk $ ) -set_target_properties(openthread-nrf52833 openthread-nrf52833-transport openthread-nrf52833-sdk openthread-nrf52833-softdevice-sdk - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-nrf52833 PUBLIC ${OT_MBEDTLS} diff --git a/examples/platforms/nrf528xx/nrf52840/nrf52840.cmake b/examples/platforms/nrf528xx/nrf52840/nrf52840.cmake index fcf1a65ef..037e53da6 100644 --- a/examples/platforms/nrf528xx/nrf52840/nrf52840.cmake +++ b/examples/platforms/nrf528xx/nrf52840/nrf52840.cmake @@ -106,12 +106,6 @@ add_library(openthread-nrf52840-softdevice-sdk $ ) -set_target_properties(openthread-nrf52840 openthread-nrf52840-transport openthread-nrf52840-sdk openthread-nrf52840-softdevice-sdk - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-nrf52840 PUBLIC ${OT_MBEDTLS} diff --git a/examples/platforms/simulation/CMakeLists.txt b/examples/platforms/simulation/CMakeLists.txt index fb670f442..9d75f1fee 100644 --- a/examples/platforms/simulation/CMakeLists.txt +++ b/examples/platforms/simulation/CMakeLists.txt @@ -75,13 +75,6 @@ add_library(openthread-simulation $ ) -set_target_properties( - openthread-simulation - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - find_library(LIBRT rt) if(LIBRT) target_link_libraries(openthread-simulation PRIVATE ${LIBRT}) diff --git a/examples/platforms/utils/CMakeLists.txt b/examples/platforms/utils/CMakeLists.txt index 523e45116..3dcc67e46 100644 --- a/examples/platforms/utils/CMakeLists.txt +++ b/examples/platforms/utils/CMakeLists.txt @@ -36,13 +36,6 @@ add_library(openthread-platform-utils OBJECT soft_source_match_table.c ) -set_target_properties( - openthread-platform-utils - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-platform-utils PRIVATE $ ) diff --git a/src/cli/ftd.cmake b/src/cli/ftd.cmake index 3d50d0c29..a101da342 100644 --- a/src/cli/ftd.cmake +++ b/src/cli/ftd.cmake @@ -28,13 +28,6 @@ add_library(openthread-cli-ftd) -set_target_properties( - openthread-cli-ftd - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-cli-ftd PRIVATE OPENTHREAD_FTD=1 diff --git a/src/cli/mtd.cmake b/src/cli/mtd.cmake index 9c06fb35f..c8c42305d 100644 --- a/src/cli/mtd.cmake +++ b/src/cli/mtd.cmake @@ -28,13 +28,6 @@ add_library(openthread-cli-mtd) -set_target_properties( - openthread-cli-mtd - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-cli-mtd PRIVATE OPENTHREAD_MTD=1 diff --git a/src/core/ftd.cmake b/src/core/ftd.cmake index dc0b10427..179f82641 100644 --- a/src/core/ftd.cmake +++ b/src/core/ftd.cmake @@ -28,13 +28,6 @@ add_library(openthread-ftd) -set_target_properties( - openthread-ftd - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-ftd PRIVATE OPENTHREAD_FTD=1 ) diff --git a/src/core/mtd.cmake b/src/core/mtd.cmake index 3ac334bf2..b8f2533ca 100644 --- a/src/core/mtd.cmake +++ b/src/core/mtd.cmake @@ -28,13 +28,6 @@ add_library(openthread-mtd) -set_target_properties( - openthread-mtd - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-mtd PRIVATE OPENTHREAD_MTD=1 ) diff --git a/src/core/radio.cmake b/src/core/radio.cmake index ffa0c7b72..880dd9c74 100644 --- a/src/core/radio.cmake +++ b/src/core/radio.cmake @@ -28,13 +28,6 @@ add_library(openthread-radio) -set_target_properties( - openthread-radio - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-radio PRIVATE OPENTHREAD_RADIO=1 ) diff --git a/src/lib/hdlc/CMakeLists.txt b/src/lib/hdlc/CMakeLists.txt index dc8458893..433bc2f93 100644 --- a/src/lib/hdlc/CMakeLists.txt +++ b/src/lib/hdlc/CMakeLists.txt @@ -30,13 +30,6 @@ add_library(openthread-hdlc hdlc.cpp ) -set_target_properties( - openthread-hdlc - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_include_directories(openthread-hdlc PUBLIC ${OT_PUBLIC_INCLUDES} diff --git a/src/lib/spinel/CMakeLists.txt b/src/lib/spinel/CMakeLists.txt index 1f2dd8dad..85114f78f 100644 --- a/src/lib/spinel/CMakeLists.txt +++ b/src/lib/spinel/CMakeLists.txt @@ -29,13 +29,6 @@ add_library(openthread-spinel-ncp) add_library(openthread-spinel-rcp) -set_target_properties( - openthread-spinel-ncp openthread-spinel-rcp - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-spinel-ncp PRIVATE OPENTHREAD_FTD=1 OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1 diff --git a/src/lib/url/CMakeLists.txt b/src/lib/url/CMakeLists.txt index dd55b0689..ed74f5c8f 100644 --- a/src/lib/url/CMakeLists.txt +++ b/src/lib/url/CMakeLists.txt @@ -30,11 +30,4 @@ add_library(openthread-url EXCLUDE_FROM_ALL url.cpp ) -set_target_properties( - openthread-url - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-url PRIVATE ot-config) diff --git a/src/ncp/ftd.cmake b/src/ncp/ftd.cmake index 020c4d271..a72bbc20a 100644 --- a/src/ncp/ftd.cmake +++ b/src/ncp/ftd.cmake @@ -28,13 +28,6 @@ add_library(openthread-ncp-ftd) -set_target_properties( - openthread-ncp-ftd - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-ncp-ftd PRIVATE OPENTHREAD_FTD=1 OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1 diff --git a/src/ncp/mtd.cmake b/src/ncp/mtd.cmake index 81a377c0c..e1ceb6f8a 100644 --- a/src/ncp/mtd.cmake +++ b/src/ncp/mtd.cmake @@ -28,13 +28,6 @@ add_library(openthread-ncp-mtd) -set_target_properties( - openthread-ncp-mtd - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-ncp-mtd PRIVATE OPENTHREAD_MTD=1 OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1 diff --git a/src/ncp/radio.cmake b/src/ncp/radio.cmake index 502961afb..d105033c3 100644 --- a/src/ncp/radio.cmake +++ b/src/ncp/radio.cmake @@ -28,13 +28,6 @@ add_library(openthread-rcp) -set_target_properties( - openthread-rcp - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(openthread-rcp PRIVATE OPENTHREAD_RADIO=1 OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1 diff --git a/src/posix/cli.cmake b/src/posix/cli.cmake index 5002da5f5..7b37d9f20 100644 --- a/src/posix/cli.cmake +++ b/src/posix/cli.cmake @@ -31,13 +31,6 @@ add_executable(ot-cli cli.cpp ) -set_target_properties( - ot-cli - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_include_directories(ot-cli PRIVATE ${COMMON_INCLUDES}) target_compile_definitions(ot-cli PRIVATE diff --git a/src/posix/daemon.cmake b/src/posix/daemon.cmake index 37b445d03..ad31affb7 100644 --- a/src/posix/daemon.cmake +++ b/src/posix/daemon.cmake @@ -30,13 +30,6 @@ add_executable(ot-daemon main.c ) -set_target_properties( - ot-daemon - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_include_directories(ot-daemon PRIVATE ${COMMON_INCLUDES}) target_compile_definitions(ot-daemon PRIVATE @@ -62,13 +55,6 @@ add_executable(ot-ctl client.cpp ) -set_target_properties( - ot-ctl - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_compile_definitions(ot-ctl PRIVATE $<$:HAVE_LIB$=1> ${OT_PLATFORM_DEFINES} diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt index 33dbebf7e..d379a318c 100644 --- a/src/posix/platform/CMakeLists.txt +++ b/src/posix/platform/CMakeLists.txt @@ -79,13 +79,6 @@ add_library(openthread-posix virtual_time.cpp ) -set_target_properties( - openthread-posix - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - target_link_libraries(openthread-posix PUBLIC openthread-platform diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index e4330852c..32d28b7e9 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -706,40 +706,3 @@ target_link_libraries(test-timer ) add_test(NAME test-timer COMMAND test-timer) - -set_target_properties( - test-platform - test-aes - test-checksum - test-child - test-child-table - test-cmd-line-parser - test-dns - test-ecdsa - test-flash - test-heap - test-hkdf-sha256 - test-hmac-sha256 - test-ip-address - test-link-quality - test-linked-list - test-lookup-table - test-lowpan - test-mac-frame - test-macros - test-message - test-message-queue - test-multicast-listeners-table - test-ndproxy-table - test-netif - test-network-data - test-pool - test-priority-queue - test-pskc - test-steering-data - test-string - test-timer - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) diff --git a/third_party/silabs/cmake/mbedtls.cmake b/third_party/silabs/cmake/mbedtls.cmake index 9ad716df8..c225018b9 100644 --- a/third_party/silabs/cmake/mbedtls.cmake +++ b/third_party/silabs/cmake/mbedtls.cmake @@ -30,12 +30,6 @@ include(${PROJECT_SOURCE_DIR}/third_party/silabs/cmake/utility.cmake) add_library(silabs-mbedtls) -set_target_properties(silabs-mbedtls - PROPERTIES - C_STANDARD 99 - CXX_STANDARD 11 -) - set(SILABS_MBEDTLS_DIR "${SILABS_GSDK_DIR}/util/third_party/crypto/mbedtls") target_compile_definitions(silabs-mbedtls