CMake: Add mbed-headers-nanostack-libservice library

rajkan01 · rajkan01 · commit cda3cc1813b1 · 2021-07-08T06:50:56.000-07:00
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.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -31,8 +31,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
