From 55790fb9602e04fbf84e9c7d5000d136f8102e8d Mon Sep 17 00:00:00 2001 From: Yakun Xu Date: Thu, 11 Jun 2020 08:03:49 +0800 Subject: [PATCH] [cmake] use ot-config to umbrella private includes (#5079) - add include directories to ot-config - remove unused OT_PRIVATE_INCLUDES --- CMakeLists.txt | 6 ++++-- examples/apps/cli/CMakeLists.txt | 1 - examples/apps/ncp/CMakeLists.txt | 1 - examples/platforms/cc1352/CMakeLists.txt | 1 - examples/platforms/cc2538/CMakeLists.txt | 1 - examples/platforms/cc2650/CMakeLists.txt | 1 - examples/platforms/cc2652/CMakeLists.txt | 1 - examples/platforms/kw41z/CMakeLists.txt | 1 - examples/platforms/qpg6095/CMakeLists.txt | 1 - examples/platforms/samr21/CMakeLists.txt | 1 - examples/platforms/simulation/CMakeLists.txt | 1 - examples/platforms/utils/CMakeLists.txt | 1 - src/cli/CMakeLists.txt | 1 - src/core/CMakeLists.txt | 1 - src/lib/hdlc/CMakeLists.txt | 1 - src/lib/platform/CMakeLists.txt | 2 -- src/lib/spinel/CMakeLists.txt | 1 - src/ncp/CMakeLists.txt | 1 - src/posix/CMakeLists.txt | 1 - src/posix/platform/CMakeLists.txt | 1 - third_party/mbedtls/CMakeLists.txt | 9 +++------ 21 files changed, 7 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ccd5ac25..53e821567 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,8 @@ set(OT_EXTERNAL_MBEDTLS "" CACHE STRING "Specify external mbedtls library") add_library(ot-config INTERFACE) +target_include_directories(ot-config INTERFACE ${PROJECT_SOURCE_DIR}/src/core) + include(TestBigEndian) TEST_BIG_ENDIAN(OT_BIG_ENDIAN) if(OT_BIG_ENDIAN) @@ -131,10 +133,10 @@ list(APPEND OT_PUBLIC_INCLUDES ${PROJECT_SOURCE_DIR}/etc/cmake) list(APPEND OT_PUBLIC_INCLUDES ${PROJECT_SOURCE_DIR}/include) if(OT_PLATFORM STREQUAL "posix") - list(APPEND OT_PRIVATE_INCLUDES ${PROJECT_SOURCE_DIR}/src/posix/platform) + target_include_directories(ot-config INTERFACE ${PROJECT_SOURCE_DIR}/src/posix/platform) add_subdirectory("${PROJECT_SOURCE_DIR}/src/posix/platform") elseif(OT_PLATFORM) - list(APPEND OT_PRIVATE_INCLUDES ${PROJECT_SOURCE_DIR}/examples/platforms/${OT_PLATFORM}) + target_include_directories(ot-config INTERFACE ${PROJECT_SOURCE_DIR}/examples/platforms/${OT_PLATFORM}) add_subdirectory("${PROJECT_SOURCE_DIR}/examples/platforms/${OT_PLATFORM}") endif() diff --git a/examples/apps/cli/CMakeLists.txt b/examples/apps/cli/CMakeLists.txt index 1b04a200e..05e1acdbf 100644 --- a/examples/apps/cli/CMakeLists.txt +++ b/examples/apps/cli/CMakeLists.txt @@ -36,7 +36,6 @@ add_executable(ot-cli-mtd set(COMMON_INCLUDES ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/src/core ) diff --git a/examples/apps/ncp/CMakeLists.txt b/examples/apps/ncp/CMakeLists.txt index 3d67effce..d6a2d02e8 100644 --- a/examples/apps/ncp/CMakeLists.txt +++ b/examples/apps/ncp/CMakeLists.txt @@ -28,7 +28,6 @@ set(COMMON_INCLUDES ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/src/core ) diff --git a/examples/platforms/cc1352/CMakeLists.txt b/examples/platforms/cc1352/CMakeLists.txt index bdf91835a..4a7031835 100644 --- a/examples/platforms/cc1352/CMakeLists.txt +++ b/examples/platforms/cc1352/CMakeLists.txt @@ -90,7 +90,6 @@ target_compile_options(openthread-cc1352 PRIVATE ${OT_CFLAGS}) target_include_directories(openthread-cc1352 PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/examples/platforms ) diff --git a/examples/platforms/cc2538/CMakeLists.txt b/examples/platforms/cc2538/CMakeLists.txt index c2a400262..7c2c50f6e 100644 --- a/examples/platforms/cc2538/CMakeLists.txt +++ b/examples/platforms/cc2538/CMakeLists.txt @@ -72,7 +72,6 @@ target_compile_options(openthread-cc2538 PRIVATE target_include_directories(openthread-cc2538 PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/src/core ) diff --git a/examples/platforms/cc2650/CMakeLists.txt b/examples/platforms/cc2650/CMakeLists.txt index ade5f2191..202730df1 100644 --- a/examples/platforms/cc2650/CMakeLists.txt +++ b/examples/platforms/cc2650/CMakeLists.txt @@ -91,7 +91,6 @@ target_compile_options(openthread-cc2650 PRIVATE ${OT_CFLAGS}) target_include_directories(openthread-cc2650 PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/examples/platforms ) diff --git a/examples/platforms/cc2652/CMakeLists.txt b/examples/platforms/cc2652/CMakeLists.txt index 04e90aeb8..98f03195e 100644 --- a/examples/platforms/cc2652/CMakeLists.txt +++ b/examples/platforms/cc2652/CMakeLists.txt @@ -92,7 +92,6 @@ target_compile_options(openthread-cc2652 target_include_directories(openthread-cc2652 PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/examples/platforms ) diff --git a/examples/platforms/kw41z/CMakeLists.txt b/examples/platforms/kw41z/CMakeLists.txt index cfcc7cfab..ac0721e1f 100644 --- a/examples/platforms/kw41z/CMakeLists.txt +++ b/examples/platforms/kw41z/CMakeLists.txt @@ -75,7 +75,6 @@ target_compile_options(openthread-kw41z target_include_directories(openthread-kw41z PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/src/core ) diff --git a/examples/platforms/qpg6095/CMakeLists.txt b/examples/platforms/qpg6095/CMakeLists.txt index 3d819036a..cf9ed6f23 100644 --- a/examples/platforms/qpg6095/CMakeLists.txt +++ b/examples/platforms/qpg6095/CMakeLists.txt @@ -96,7 +96,6 @@ target_compile_options(openthread-qpg6095 target_include_directories(openthread-qpg6095 PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/examples/platforms ) diff --git a/examples/platforms/samr21/CMakeLists.txt b/examples/platforms/samr21/CMakeLists.txt index a2d102f67..9355d6c91 100644 --- a/examples/platforms/samr21/CMakeLists.txt +++ b/examples/platforms/samr21/CMakeLists.txt @@ -95,7 +95,6 @@ target_compile_options(openthread-samr21 target_include_directories(openthread-samr21 PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/examples/platforms ) diff --git a/examples/platforms/simulation/CMakeLists.txt b/examples/platforms/simulation/CMakeLists.txt index 4449d76d2..a0303a0ae 100644 --- a/examples/platforms/simulation/CMakeLists.txt +++ b/examples/platforms/simulation/CMakeLists.txt @@ -94,7 +94,6 @@ target_compile_options(openthread-simulation PRIVATE target_include_directories(openthread-simulation PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/core diff --git a/examples/platforms/utils/CMakeLists.txt b/examples/platforms/utils/CMakeLists.txt index 3fa4f3777..7ce733ca8 100644 --- a/examples/platforms/utils/CMakeLists.txt +++ b/examples/platforms/utils/CMakeLists.txt @@ -36,7 +36,6 @@ add_library(openthread-platform-utils OBJECT target_include_directories(openthread-platform-utils PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms/utils ${PROJECT_SOURCE_DIR}/src/core diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt index 27865f9db..2dbbde310 100644 --- a/src/cli/CMakeLists.txt +++ b/src/cli/CMakeLists.txt @@ -53,7 +53,6 @@ target_compile_options(openthread-cli-mtd PRIVATE ) set(COMMON_INCLUDES - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/core ) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index afd923399..2ef88e6cd 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -62,7 +62,6 @@ target_compile_options(openthread-radio PRIVATE ) set(COMMON_INCLUDES - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src/core ) diff --git a/src/lib/hdlc/CMakeLists.txt b/src/lib/hdlc/CMakeLists.txt index 458b45c6a..dc8458893 100644 --- a/src/lib/hdlc/CMakeLists.txt +++ b/src/lib/hdlc/CMakeLists.txt @@ -42,7 +42,6 @@ target_include_directories(openthread-hdlc ${OT_PUBLIC_INCLUDES} PRIVATE ${PROJECT_SOURCE_DIR}/src/core - ${OT_PRIVATE_INCLUDES} ) target_link_libraries(openthread-hdlc PRIVATE ot-config) diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index 7fa414996..198140af0 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -35,8 +35,6 @@ target_include_directories(openthread-platform PUBLIC ${OT_PUBLIC_INCLUDES} ${PROJECT_SOURCE_DIR}/src/ - PRIVATE - ${OT_PRIVATE_INCLUDES} ) target_link_libraries(openthread-platform PRIVATE ot-config) diff --git a/src/lib/spinel/CMakeLists.txt b/src/lib/spinel/CMakeLists.txt index f7c0916f0..f7b24baba 100644 --- a/src/lib/spinel/CMakeLists.txt +++ b/src/lib/spinel/CMakeLists.txt @@ -57,7 +57,6 @@ target_compile_options(openthread-spinel-rcp PRIVATE ) set(COMMON_INCLUDES - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/core ) diff --git a/src/ncp/CMakeLists.txt b/src/ncp/CMakeLists.txt index fce819b4a..96928e8db 100644 --- a/src/ncp/CMakeLists.txt +++ b/src/ncp/CMakeLists.txt @@ -66,7 +66,6 @@ target_compile_options(openthread-rcp PRIVATE ) set(COMMON_INCLUDES - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/core ) diff --git a/src/posix/CMakeLists.txt b/src/posix/CMakeLists.txt index d7a8538f8..907e84c06 100644 --- a/src/posix/CMakeLists.txt +++ b/src/posix/CMakeLists.txt @@ -28,7 +28,6 @@ set(COMMON_INCLUDES ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/posix/platform diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt index d46d411dd..e509b2eda 100644 --- a/src/posix/platform/CMakeLists.txt +++ b/src/posix/platform/CMakeLists.txt @@ -98,7 +98,6 @@ target_compile_options(openthread-posix PRIVATE target_include_directories(openthread-posix PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/third_party/mbedtls/repo/include diff --git a/third_party/mbedtls/CMakeLists.txt b/third_party/mbedtls/CMakeLists.txt index 249ef7586..7725d93d0 100644 --- a/third_party/mbedtls/CMakeLists.txt +++ b/third_party/mbedtls/CMakeLists.txt @@ -46,8 +46,7 @@ target_include_directories(mbedtls ${CMAKE_CURRENT_SOURCE_DIR}/repo/include PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} - ${PROJECT_SOURCE_DIR}/src/core + $ ) target_compile_definitions(mbedx509 @@ -61,8 +60,7 @@ target_include_directories(mbedx509 ${CMAKE_CURRENT_SOURCE_DIR}/repo/include PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} - ${PROJECT_SOURCE_DIR}/src/core + $ ) target_compile_definitions(mbedcrypto @@ -76,6 +74,5 @@ target_include_directories(mbedcrypto ${CMAKE_CURRENT_SOURCE_DIR}/repo/include PRIVATE ${OT_PUBLIC_INCLUDES} - ${OT_PRIVATE_INCLUDES} - ${PROJECT_SOURCE_DIR}/src/core + $ )