CMake: Create mbed-headers-ble library

rajkan01 · rajkan01 · commit a61392ae3051 · 2021-07-21T01:51:48.000-07:00
Previously ble headers are part of mbed-headers-connectivity, this PR
moves ble headers into new mbed-headers-ble to make ble stubs to be
more self-contained and improves the composition of the library.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -4,13 +4,11 @@
 add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
 add_library(mbed-headers-base INTERFACE)
-add_library(mbed-headers-connectivity INTERFACE)
 
 target_link_libraries(mbed-headers
     INTERFACE
         mbed-headers-base
         mbed-headers-platform
-        mbed-headers-connectivity
         mbed-headers-drivers
         mbed-headers-hal
         mbed-headers-events
@@ -28,12 +26,6 @@ target_include_directories(mbed-headers-base
         ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/sys
 )
 
-target_include_directories(mbed-headers-connectivity
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/connectivity
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
-        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
-)
 
 target_include_directories(mbed-headers
     INTERFACE
diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
@@ -43,4 +43,5 @@ else()
     add_subdirectory(netsocket)
     add_subdirectory(mbedtls)
     add_subdirectory(libraries)
+    add_subdirectory(FEATURE_BLE)
 endif()
diff --git a/connectivity/FEATURE_BLE/CMakeLists.txt b/connectivity/FEATURE_BLE/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    add_subdirectory(tests/UNITTESTS)
+endif()
+
 add_subdirectory(libraries)
 add_subdirectory(source)
 
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/.mbedignore b/connectivity/FEATURE_BLE/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/CMakeLists.txt b/connectivity/FEATURE_BLE/tests/UNITTESTS/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+add_subdirectory(doubles)
diff --git a/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/FEATURE_BLE/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-feature-ble INTERFACE)
+
+target_include_directories(mbed-headers-feature-ble
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
+        ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
+)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Copyright (c) 2021 ARM Limited. All rights reserved.`
	`2`	`+# SPDX-License-Identifier: Apache-2.0`
	`3`	`+add_subdirectory(doubles)`