CMake: unit-tests: Add mbed-headers-cellular headers library

rajkan01 · rajkan01 · commit 4a1edc5c8fa6 · 2021-06-30T05:20:59.000-07:00
- Previously all cellular header made as a part of the
mbed-headers-connectivity library. To make it easier to separate all
the cellular headers into the separate mbed-headers-cellular library
and keep them as part of cellular stub CMake. This makes the cellular
stubs more self-contained and improves the composition of the library.
- Update all unit test that depends on cellular headers with mbed-headers-cellular library
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -67,11 +67,6 @@ target_include_directories(mbed-headers-connectivity
         ${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/cellular/include/cellular/framework/API
-        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/AT
-        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/device
-        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework
-        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/common
         ${mbed-os_SOURCE_DIR}/connectivity
         ${mbed-os_SOURCE_DIR}/connectivity/lorawan/include/lorawan
         ${mbed-os_SOURCE_DIR}/connectivity/lorawan/lorastack
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -1,6 +1,17 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-headers-cellular INTERFACE)
+
+target_include_directories(mbed-headers-cellular
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/API
+        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/AT
+        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/device
+        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework
+        ${mbed-os_SOURCE_DIR}/connectivity/cellular/include/cellular/framework/common        
+)
+
 add_library(mbed-stubs-cellular)
 
 target_compile_definitions(mbed-stubs-cellular
@@ -34,6 +45,7 @@ target_sources(mbed-stubs-cellular
 target_link_libraries(mbed-stubs-cellular
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         mbed-stubs-headers
         gtest
 )
diff --git 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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
diff --git 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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
diff --git 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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
diff --git 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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
diff --git 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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/common/list/CMakeLists.txt
@@ -13,6 +13,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         gmock_main
 )
 
diff --git 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-cellular
         mbed-stubs-platform
         gmock_main
 )
diff --git 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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
diff --git 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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyeu433/CMakeLists.txt
@@ -21,6 +21,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         mbed-stubs
         mbed-stubs-headers
         gmock_main
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphykr920/CMakeLists.txt
@@ -21,6 +21,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         mbed-stubs
         mbed-stubs-headers
         gmock_main
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/loraphyus915/CMakeLists.txt
@@ -27,6 +27,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         mbed-stubs
         mbed-stubs-headers
         gmock_main
diff --git a/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/features/lorawan/lorawaninterface/CMakeLists.txt
@@ -20,6 +20,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-cellular
         mbed-stubs
         mbed-stubs-headers
         gmock_main
diff --git 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-cellular
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ target_sources(${TEST_NAME}`
`13`	`13`	`target_link_libraries(${TEST_NAME}`
`14`	`14`	`PRIVATE`
`15`	`15`	`mbed-headers`
	`16`	`+ mbed-headers-cellular`
`16`	`17`	`gmock_main`
`17`	`18`	`)`
`18`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}`
`14`	`14`	`target_link_libraries(${TEST_NAME}`
`15`	`15`	`PRIVATE`
`16`	`16`	`mbed-headers`
	`17`	`+ mbed-headers-cellular`
`17`	`18`	`mbed-stubs-platform`
`18`	`19`	`gmock_main`
`19`	`20`	`)`