From 22b2e9f800409f4eb341e7c171e91a3982a44985 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 8 Jul 2021 06:04:24 -0700 Subject: [PATCH] CMake: Add mbed-headers-nanostack-libservice library Previously all nanostack libservice headers part of mbed-headers-connectivity. This PR moves all the nanostack libservice headers into newly added mbed-headers-nanostack-libraries. This makes the nanostack libservice stubs more self-contained and improves the composition of the library. --- UNITTESTS/stubs/CMakeLists.txt | 2 -- .../framework/AT/at_cellularstack/CMakeLists.txt | 1 + .../framework/device/cellularcontext/CMakeLists.txt | 1 + .../libraries/tests/UNITTESTS/doubles/CMakeLists.txt | 8 ++++++++ .../tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/InternetSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/SocketAddress/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt | 1 + .../UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt | 1 + .../tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt | 1 + 17 files changed, 23 insertions(+), 2 deletions(-) diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt index 3f381baafc..8fe0d35092 100644 --- a/UNITTESTS/stubs/CMakeLists.txt +++ b/UNITTESTS/stubs/CMakeLists.txt @@ -30,8 +30,6 @@ target_include_directories(mbed-headers-base target_include_directories(mbed-headers-connectivity INTERFACE - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice - ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice ${mbed-os_SOURCE_DIR}/connectivity ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble diff --git a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt index 1f84162a9d..b7c7244f5e 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-headers-cellular mbed-stubs diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt index 9d8c2aa34a..56e3e80aa0 100644 --- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt +++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt @@ -36,6 +36,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-headers-cellular mbed-stubs diff --git a/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt index f2b9b91271..dffaab587c 100644 --- a/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt +++ b/connectivity/libraries/tests/UNITTESTS/doubles/CMakeLists.txt @@ -1,6 +1,13 @@ # Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_library(mbed-headers-nanostack-libservice INTERFACE) + +target_include_directories(mbed-headers-nanostack-libservice + INTERFACE + ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice + ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice +) add_library(mbed-stubs-nanostack-libservice) target_sources(mbed-stubs-nanostack-libservice @@ -13,6 +20,7 @@ target_link_libraries(mbed-stubs-nanostack-libservice PRIVATE mbed-stubs-rtos-headers mbed-headers + mbed-headers-nanostack-libservice mbed-stubs-headers mbed-stubs-rtos mbed-stubs-platform diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt index 7a8a4c1f79..311aa7918f 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocket/CMakeLists.txt @@ -31,6 +31,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt index 27de0ddbfd..ce9bc9dc5e 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/DTLSSocketWrapper/CMakeLists.txt @@ -30,6 +30,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt index c0c34e3ff4..356e869d88 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/EthernetInterface/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE + mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket mbed-headers diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt index 5056cc0fba..d658c702dc 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/IfaceDnsSocket/CMakeLists.txt @@ -43,6 +43,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt index efed786cc8..53daa2164c 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/InternetSocket/CMakeLists.txt @@ -26,6 +26,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs mbed-stubs-headers diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt index 80862ec158..7f03ae2106 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkInterface/CMakeLists.txt @@ -29,6 +29,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs mbed-stubs-headers diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt index 77a21b3cd2..b6ac2bffef 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/NetworkStack/CMakeLists.txt @@ -25,6 +25,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs mbed-stubs-headers diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt index d2b8b7dcfe..2fc2180052 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/PPPInterface/CMakeLists.txt @@ -29,6 +29,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt index 0e36bc724d..3cad0d68f4 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/SocketAddress/CMakeLists.txt @@ -19,6 +19,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs mbed-stubs-headers diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt index b4d6d164e9..8e54e74164 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TCPSocket/CMakeLists.txt @@ -27,6 +27,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs mbed-stubs-headers diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt index e10cd24943..996a83f216 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocket/CMakeLists.txt @@ -29,6 +29,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt index 43472c5f20..963806da5d 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/TLSSocketWrapper/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-mbedtls mbed-headers-netsocket mbed-stubs diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt index e4ffc7e663..f79024d257 100644 --- a/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt +++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/UDPSocket/CMakeLists.txt @@ -28,6 +28,7 @@ target_sources(${TEST_NAME} target_link_libraries(${TEST_NAME} PRIVATE mbed-headers + mbed-headers-nanostack-libservice mbed-headers-netsocket mbed-stubs mbed-stubs-headers