CMake: Componentize Mbed OS into multiple CMake targets

CMakeLists.txt

@@ -25,7 +25,6 @@ include(${MBED_ROOT}/tools/cmake/core.cmake)
 include(${MBED_ROOT}/tools/cmake/util.cmake)
 include(${MBED_ROOT}/tools/cmake/profile.cmake)
 
-# Create Mbed OS library
 add_library(mbed-os OBJECT)
 
 # Validate selected C library type
@@ -80,19 +79,26 @@ target_include_directories(mbed-os
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-# Default build
+# TODO CMake: This component is made visible here so its source files in
+# drivers/ can be added and it can be linked against by libraries in storage/.
+# Should the source files be moved from drivers/ to storage/ ?
+add_library(mbed-os-device_key INTERFACE)
+
 add_subdirectory(cmsis)
-add_subdirectory(components)
-add_subdirectory(connectivity)
 add_subdirectory(drivers)
-add_subdirectory(events)
-add_subdirectory(features)
 add_subdirectory(hal)
 add_subdirectory(platform)
 add_subdirectory(rtos)
-add_subdirectory(storage)
 add_subdirectory(targets)
 
+# The directories below contain optional target libraries
+add_subdirectory(events EXCLUDE_FROM_ALL)
+add_subdirectory(connectivity EXCLUDE_FROM_ALL)
+add_subdirectory(storage EXCLUDE_FROM_ALL)
+add_subdirectory(drivers/device_key EXCLUDE_FROM_ALL)
+add_subdirectory(drivers/source/usb EXCLUDE_FROM_ALL)
+add_subdirectory(features EXCLUDE_FROM_ALL)
+add_subdirectory(platform/FEATURE_EXPERIMENTAL_API EXCLUDE_FROM_ALL)
 
 #
 # Configures the application
@@ -134,7 +140,6 @@ function(mbed_set_mbed_target_linker_script target)
     )
 endfunction()
 
-
 #
 # Converts output file of `target` to binary file and to Intel HEX file.
 #

cmsis/CMakeLists.txt

@@ -3,3 +3,4 @@
 
 add_subdirectory(CMSIS_5)
 add_subdirectory(device)
+

connectivity/CMakeLists.txt

@@ -1,8 +1,33 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-mbed_add_cmake_directory_if_labels("FEATURE")
+# List of all connectivity libraries available.
+add_library(mbed-os-802.15.4-rf INTERFACE)
+add_library(mbed-os-ble INTERFACE)
+add_library(mbed-os-ble-blue_nrg INTERFACE)
+add_library(mbed-os-ble-cordio INTERFACE)
+add_library(mbed-os-ble-cordio_ll INTERFACE)
+add_library(mbed-os-cellular INTERFACE)
+add_library(mbed-os-coap INTERFACE)
+add_library(mbed-os-emac INTERFACE)
+add_library(mbed-os-lorawan INTERFACE)
+add_library(mbed-os-lwipstack INTERFACE)
+add_library(mbed-os-mbedtls INTERFACE)
+add_library(mbed-os-mbedtls-cryptocell310 INTERFACE)
+add_library(mbed-os-nanostack INTERFACE)
+add_library(mbed-os-nanostack-coap_service INTERFACE)
+add_library(mbed-os-nanostack-mbed_mesh_api INTERFACE)
+add_library(mbed-os-nanostack-hal_mbed_cmsis_rtos INTERFACE)
+add_library(mbed-os-nanostack-sal_stack INTERFACE)
+add_library(mbed-os-nanostack-sal_stack-event_loop INTERFACE)
+add_library(mbed-os-nanostack-libservice INTERFACE)
+add_library(mbed-os-netsocket INTERFACE)
+add_library(mbed-os-nfc INTERFACE)
+add_library(mbed-os-ppp INTERFACE)
+add_library(mbed-os-wifi INTERFACE)
 
+
+add_subdirectory(FEATURE_BLE)
 add_subdirectory(cellular)
 add_subdirectory(drivers)
 add_subdirectory(libraries)
@@ -12,8 +37,3 @@ add_subdirectory(mbedtls)
 add_subdirectory(nanostack)
 add_subdirectory(netsocket)
 add_subdirectory(nfc)
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)

connectivity/FEATURE_BLE/CMakeLists.txt

@@ -4,8 +4,8 @@
 add_subdirectory(libraries)
 add_subdirectory(source)
 
-target_include_directories(mbed-os
-    PUBLIC
+target_include_directories(mbed-os-ble
+    INTERFACE
         .
         include
         include/ble
@@ -20,3 +20,8 @@ target_include_directories(mbed-os
         include/ble/services
         source
 )
+
+target_compile_definitions(mbed-os-ble
+    INTERFACE
+        MBED_CONF_BLE_PRESENT=1
+)

connectivity/FEATURE_BLE/libraries/CMakeLists.txt

@@ -1,11 +1,18 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-mbed_add_cmake_directory_if_labels("TARGET")
+if("CORDIO_LL" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(TARGET_CORDIO_LL)
+endif()
 
 add_subdirectory(cordio_stack)
 
-target_include_directories(mbed-os
-    PUBLIC
+target_include_directories(mbed-os-ble-cordio
+    INTERFACE
         .
 )
+
+target_link_libraries(mbed-os-ble-cordio
+    INTERFACE
+        mbed-os-ble
+)

connectivity/FEATURE_BLE/libraries/TARGET_CORDIO_LL/CMakeLists.txt

@@ -1,29 +1,29 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/include/ble
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/include/common
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/sources/ble/bb
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/sources/ble/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/sources/ble/lctr
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/sources/ble/lhci
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/sources/ble/sch
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/sources/common/bb
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/controller/sources/common/sch
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/thirdparty
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/thirdparty/nordic-bsp/components/boards
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack/thirdparty/uecc
-        ${CMAKE_CURRENT_SOURCE_DIR}/stack_adaptation
+target_include_directories(mbed-os-ble-cordio_ll
+    INTERFACE
+        .
+        ./stack
+        ./stack/controller
+        ./stack/controller/include
+        ./stack/controller/include/ble
+        ./stack/controller/include/common
+        ./stack/controller/sources/ble/bb
+        ./stack/controller/sources/ble/include
+        ./stack/controller/sources/ble/lctr
+        ./stack/controller/sources/ble/lhci
+        ./stack/controller/sources/ble/sch
+        ./stack/controller/sources/common/bb
+        ./stack/controller/sources/common/sch
+        ./stack/thirdparty
+        ./stack/thirdparty/nordic-bsp/components/boards
+        ./stack/thirdparty/uecc
+        ./stack_adaptation
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/controller/sources/ble/bb/bb_ble_adv_master.c
         stack/controller/sources/ble/bb/bb_ble_adv_master_ae.c
         stack/controller/sources/ble/bb/bb_ble_adv_slave.c
@@ -45,14 +45,14 @@ target_sources(mbed-os
         stack/controller/sources/ble/bb/bb_ble_whitelist.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/controller/sources/ble/init/init.c
         stack/controller/sources/ble/init/init_ctr.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/controller/sources/ble/lctr/lctr_act_adv_master.c
         stack/controller/sources/ble/lctr/lctr_act_adv_master_ae.c
         stack/controller/sources/ble/lctr/lctr_act_adv_slave.c
@@ -145,8 +145,8 @@ target_sources(mbed-os
         stack/controller/sources/ble/lctr/lctr_sm_llcp_slave_phy.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/controller/sources/ble/lhci/lhci_cmd.c
         stack/controller/sources/ble/lhci/lhci_cmd_adv_master.c
         stack/controller/sources/ble/lhci/lhci_cmd_adv_master_ae.c
@@ -224,8 +224,8 @@ target_sources(mbed-os
         stack/controller/sources/ble/lhci/lhci_main_iso.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/controller/sources/ble/ll/ll_init.c
         stack/controller/sources/ble/ll/ll_init_adv_master.c
         stack/controller/sources/ble/ll/ll_init_adv_master_ae.c
@@ -275,8 +275,8 @@ target_sources(mbed-os
         stack/controller/sources/ble/ll/ll_math.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/controller/sources/ble/lmgr/lmgr_events.c
         stack/controller/sources/ble/lmgr/lmgr_main.c
         stack/controller/sources/ble/lmgr/lmgr_main_adv_master_ae.c
@@ -290,15 +290,15 @@ target_sources(mbed-os
         stack/controller/sources/ble/lmgr/lmgr_main_slave.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/controller/sources/ble/sch/sch_ble.c
         stack/controller/sources/ble/sch/sch_rm.c
         stack/controller/sources/ble/sch/sch_tm.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/controller/sources/common/bb/bb_main.c
 
         stack/controller/sources/common/chci/chci_tr.c
@@ -307,16 +307,21 @@ target_sources(mbed-os
         stack/controller/sources/common/sch/sch_main.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack/thirdparty/nordic-bsp/components/boards/boards.c
 
         stack/thirdparty/uecc/asm_arm.inc
         stack/thirdparty/uecc/uECC.c
         stack/thirdparty/uecc/uECC_ll.c
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio_ll
+    INTERFACE
         stack_adaptation/custom_chci_tr.cpp
 )
+
+target_link_libraries(mbed-os-ble-cordio_ll
+    INTERFACE
+        mbed-os-ble-cordio
+)

connectivity/FEATURE_BLE/libraries/cordio_stack/ble-host/CMakeLists.txt

@@ -1,8 +1,8 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-os
-    PUBLIC
+target_include_directories(mbed-os-ble-cordio
+    INTERFACE
         include
         sources/hci/dual_chip
         sources/sec/common
@@ -14,8 +14,8 @@ target_include_directories(mbed-os
         sources/stack/smp
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio
+    INTERFACE
         sources/hci/common/hci_core.c
 
         sources/hci/dual_chip/hci_cmd.c

connectivity/FEATURE_BLE/libraries/cordio_stack/platform/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-os
-    PUBLIC
+target_include_directories(mbed-os-ble-cordio
+    INTERFACE
         include
 )

connectivity/FEATURE_BLE/libraries/cordio_stack/wsf/CMakeLists.txt

@@ -1,14 +1,14 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-os
-    PUBLIC
+target_include_directories(mbed-os-ble-cordio
+    INTERFACE
         include
         include/util
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio
+    INTERFACE
         sources/port/baremetal/wsf_assert.c
         sources/port/baremetal/wsf_buf.c
         sources/port/baremetal/wsf_bufio.c

connectivity/FEATURE_BLE/source/CMakeLists.txt

@@ -7,8 +7,8 @@ add_subdirectory(gatt)
 add_subdirectory(generic)
 add_subdirectory(pal)
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble
+    INTERFACE
         BLE.cpp
         Gap.cpp
         GattClient.cpp

connectivity/FEATURE_BLE/source/cordio/CMakeLists.txt

@@ -1,15 +1,15 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-os
-    PUBLIC
+target_include_directories(mbed-os-ble-cordio
+    INTERFACE
         .
         source
         stack_adaptation
 )
 
-target_sources(mbed-os
-    PRIVATE
+target_sources(mbed-os-ble-cordio
+    INTERFACE
         driver/CordioHCIDriver.cpp
         driver/CordioHCITransportDriver.cpp
         driver/H4TransportDriver.cpp