espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-13 04:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cmake] use ot-config to umbrella private includes (#5079)

Browse Source 
- add include directories to ot-config
- remove unused OT_PRIVATE_INCLUDES
This commit is contained in:
Yakun Xu
2020-06-10 17:03:49 -07:00
committed by GitHub
parent 71c0def4f8
commit 55790fb960
21 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -2
View File
@@ -40,6 +40,8 @@ set(OT_EXTERNAL_MBEDTLS "" CACHE STRING "Specify external mbedtls library")
add_library(ot-config INTERFACE) add_library(ot-config INTERFACE)
target_include_directories(ot-config INTERFACE ${PROJECT_SOURCE_DIR}/src/core)
include(TestBigEndian) include(TestBigEndian)
TEST_BIG_ENDIAN(OT_BIG_ENDIAN) TEST_BIG_ENDIAN(OT_BIG_ENDIAN)
if(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) list(APPEND OT_PUBLIC_INCLUDES ${PROJECT_SOURCE_DIR}/include)
if(OT_PLATFORM STREQUAL "posix") 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") add_subdirectory("${PROJECT_SOURCE_DIR}/src/posix/platform")
elseif(OT_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}") add_subdirectory("${PROJECT_SOURCE_DIR}/examples/platforms/${OT_PLATFORM}")
endif() endif()
examples/apps/cli/CMakeLists.txt
-1
View File
@@ -36,7 +36,6 @@ add_executable(ot-cli-mtd
set(COMMON_INCLUDES set(COMMON_INCLUDES
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
) )
examples/apps/ncp/CMakeLists.txt
-1
View File
@@ -28,7 +28,6 @@
set(COMMON_INCLUDES set(COMMON_INCLUDES
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
) )
examples/platforms/cc1352/CMakeLists.txt
-1
View File
@@ -90,7 +90,6 @@ target_compile_options(openthread-cc1352 PRIVATE ${OT_CFLAGS})
target_include_directories(openthread-cc1352 target_include_directories(openthread-cc1352
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
) )
examples/platforms/cc2538/CMakeLists.txt
-1
View File
@@ -72,7 +72,6 @@ target_compile_options(openthread-cc2538 PRIVATE
target_include_directories(openthread-cc2538 PRIVATE target_include_directories(openthread-cc2538 PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
) )
examples/platforms/cc2650/CMakeLists.txt
-1
View File
@@ -91,7 +91,6 @@ target_compile_options(openthread-cc2650 PRIVATE ${OT_CFLAGS})
target_include_directories(openthread-cc2650 target_include_directories(openthread-cc2650
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
) )
examples/platforms/cc2652/CMakeLists.txt
-1
View File
@@ -92,7 +92,6 @@ target_compile_options(openthread-cc2652
target_include_directories(openthread-cc2652 target_include_directories(openthread-cc2652
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
) )
examples/platforms/kw41z/CMakeLists.txt
-1
View File
@@ -75,7 +75,6 @@ target_compile_options(openthread-kw41z
target_include_directories(openthread-kw41z target_include_directories(openthread-kw41z
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
) )
examples/platforms/qpg6095/CMakeLists.txt
-1
View File
@@ -96,7 +96,6 @@ target_compile_options(openthread-qpg6095
target_include_directories(openthread-qpg6095 target_include_directories(openthread-qpg6095
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
) )
examples/platforms/samr21/CMakeLists.txt
-1
View File
@@ -95,7 +95,6 @@ target_compile_options(openthread-samr21
target_include_directories(openthread-samr21 target_include_directories(openthread-samr21
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
) )
examples/platforms/simulation/CMakeLists.txt
-1
View File
@@ -94,7 +94,6 @@ target_compile_options(openthread-simulation PRIVATE
target_include_directories(openthread-simulation PRIVATE target_include_directories(openthread-simulation PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
examples/platforms/utils/CMakeLists.txt
-1
View File
@@ -36,7 +36,6 @@ add_library(openthread-platform-utils OBJECT
target_include_directories(openthread-platform-utils PRIVATE target_include_directories(openthread-platform-utils PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/examples/platforms ${PROJECT_SOURCE_DIR}/examples/platforms
${PROJECT_SOURCE_DIR}/examples/platforms/utils ${PROJECT_SOURCE_DIR}/examples/platforms/utils
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
src/cli/CMakeLists.txt
-1
View File
@@ -53,7 +53,6 @@ target_compile_options(openthread-cli-mtd PRIVATE
) )
set(COMMON_INCLUDES set(COMMON_INCLUDES
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
) )
src/core/CMakeLists.txt
-1
View File
@@ -62,7 +62,6 @@ target_compile_options(openthread-radio PRIVATE
) )
set(COMMON_INCLUDES set(COMMON_INCLUDES
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
) )
src/lib/hdlc/CMakeLists.txt
-1
View File
@@ -42,7 +42,6 @@ target_include_directories(openthread-hdlc
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
PRIVATE PRIVATE
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
${OT_PRIVATE_INCLUDES}
) )
target_link_libraries(openthread-hdlc PRIVATE ot-config) target_link_libraries(openthread-hdlc PRIVATE ot-config)
src/lib/platform/CMakeLists.txt
-2
View File
@@ -35,8 +35,6 @@ target_include_directories(openthread-platform
PUBLIC PUBLIC
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${PROJECT_SOURCE_DIR}/src/ ${PROJECT_SOURCE_DIR}/src/
PRIVATE
${OT_PRIVATE_INCLUDES}
) )
target_link_libraries(openthread-platform PRIVATE ot-config) target_link_libraries(openthread-platform PRIVATE ot-config)
src/lib/spinel/CMakeLists.txt
-1
View File
@@ -57,7 +57,6 @@ target_compile_options(openthread-spinel-rcp PRIVATE
) )
set(COMMON_INCLUDES set(COMMON_INCLUDES
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
) )
src/ncp/CMakeLists.txt
-1
View File
@@ -66,7 +66,6 @@ target_compile_options(openthread-rcp PRIVATE
) )
set(COMMON_INCLUDES set(COMMON_INCLUDES
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
) )
src/posix/CMakeLists.txt
-1
View File
@@ -28,7 +28,6 @@
set(COMMON_INCLUDES set(COMMON_INCLUDES
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
${PROJECT_SOURCE_DIR}/src/posix/platform ${PROJECT_SOURCE_DIR}/src/posix/platform
src/posix/platform/CMakeLists.txt
-1
View File
@@ -98,7 +98,6 @@ target_compile_options(openthread-posix PRIVATE
target_include_directories(openthread-posix PRIVATE target_include_directories(openthread-posix PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES}
${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src
${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/src/core
${PROJECT_SOURCE_DIR}/third_party/mbedtls/repo/include ${PROJECT_SOURCE_DIR}/third_party/mbedtls/repo/include
third_party/mbedtls/CMakeLists.txt
Vendored
+3 -6
View File
@@ -46,8 +46,7 @@ target_include_directories(mbedtls
${CMAKE_CURRENT_SOURCE_DIR}/repo/include ${CMAKE_CURRENT_SOURCE_DIR}/repo/include
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES} $<TARGET_PROPERTY:ot-config,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/src/core
) )
target_compile_definitions(mbedx509 target_compile_definitions(mbedx509
@@ -61,8 +60,7 @@ target_include_directories(mbedx509
${CMAKE_CURRENT_SOURCE_DIR}/repo/include ${CMAKE_CURRENT_SOURCE_DIR}/repo/include
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES} $<TARGET_PROPERTY:ot-config,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/src/core
) )
target_compile_definitions(mbedcrypto target_compile_definitions(mbedcrypto
@@ -76,6 +74,5 @@ target_include_directories(mbedcrypto
${CMAKE_CURRENT_SOURCE_DIR}/repo/include ${CMAKE_CURRENT_SOURCE_DIR}/repo/include
PRIVATE PRIVATE
${OT_PUBLIC_INCLUDES} ${OT_PUBLIC_INCLUDES}
${OT_PRIVATE_INCLUDES} $<TARGET_PROPERTY:ot-config,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/src/core
) )