CMake: Add mbed-headers-netsocket headers library

- Previously, all netsocket headers made as a part of the mbed-headers-connectivity library. To make it easier to separate all the netsocket headers into the separate mbed-headers-netsocket library and keep them, as part of netsocket stubs CMake. This makes the netsocket stubs more self-contained and improves the composition of the library. - Update cellular, netsocket unit tests to link only with a mbed-headers-netsocket library that it depends on instead of link with mbed-headers which is a group of headers libraries.
2021-07-05 04:48:05 -07:00 · 2021-07-05 04:48:05 -07:00 · 68b46f6199
parent cb343f9ba9
commit 68b46f6199
29 changed files with 35 additions and 1 deletions
--- a/UNITTESTS/stubs/CMakeLists.txt
+++ b/UNITTESTS/stubs/CMakeLists.txt
@ -43,7 +43,6 @@ 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/netsocket/include
        ${mbed-os_SOURCE_DIR}/connectivity
        ${mbed-os_SOURCE_DIR}/connectivity/mbedtls
        ${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include
--- a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@ -51,6 +51,7 @@ target_link_libraries(mbed-stubs-cellular
        mbed-headers-drivers
        mbed-headers-hal
        mbed-headers-events
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs-netsocket
        mbed-stubs-headers
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt
@ -24,6 +24,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-headers-filesystem
        mbed-stubs
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/CMakeLists.txt
@ -30,6 +30,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-netsocket
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/CMakeLists.txt
@ -22,6 +22,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-netsocket
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/CMakeLists.txt
@ -23,6 +23,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-netsocket
--- a/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/CMakeLists.txt
@ -23,6 +23,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-cellular
--- a/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/common/util/CMakeLists.txt
@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs-platform
        gmock_main
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@ -24,6 +24,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-cellular
--- 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-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-cellular
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@ -27,6 +27,7 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
+        mbed-headers-netsocket
        mbed-headers
        mbed-headers-cellular
        mbed-stubs
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@ -29,6 +29,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-cellular
--- a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/netsocket/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-netsocket INTERFACE)
+
+target_include_directories(mbed-headers-netsocket
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity/netsocket/include
+)
+
 add_library(mbed-stubs-netsocket)

 target_sources(mbed-stubs-netsocket
@ -17,6 +24,7 @@ target_sources(mbed-stubs-netsocket

 target_link_libraries(mbed-stubs-netsocket
    PRIVATE
+        mbed-headers-netsocket
        mbed-stubs-rtos-headers
        mbed-headers
        mbed-stubs-headers
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
@ -23,6 +23,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-headers-cellular
        mbed-stubs
        mbed-stubs-cellular
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-headers
        mbed-stubs
        mbed-stubs-headers
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        gmock_main
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- 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-netsocket
        mbed-stubs
        mbed-stubs-headers
        mbed-stubs-netsocket
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/WiFiAccessPoint/CMakeLists.txt
@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
    PRIVATE
        mbed-headers
+        mbed-headers-netsocket
        mbed-stubs
        mbed-stubs-headers
        gmock_main