CMake: Rename CMake targets

CMakeLists.txt

@@ -24,7 +24,9 @@ enable_language(C CXX ASM)
 include(${MBED_ROOT}/tools/cmake/core.cmake)
 include(${MBED_ROOT}/tools/cmake/profile.cmake)
 
-add_library(mbed-os OBJECT)
+add_library(mbed-core OBJECT)
+# TODO CMAKE: Replace mbed-os by a new one that will include mbed-core and mbed-rtos
+add_library(mbed-os ALIAS mbed-core)
 
 # Validate selected C library type
 # The C library type selected has to match the library that the target can support
@@ -54,34 +56,34 @@ if(NOT ${MBED_PRINTF_LIB} IN_LIST MBED_PRINTF_LIB_TYPES)
     )
 endif()
 
-mbed_set_cpu_core_options(mbed-os ${MBED_TOOLCHAIN})
-mbed_set_toolchain_options(mbed-os)
-mbed_set_c_lib(mbed-os ${MBED_C_LIB})
-mbed_set_printf_lib(mbed-os ${MBED_PRINTF_LIB})
-mbed_set_language_standard(mbed-os)
-mbed_set_profile_options(mbed-os ${MBED_TOOLCHAIN})
+mbed_set_cpu_core_options(mbed-core ${MBED_TOOLCHAIN})
+mbed_set_toolchain_options(mbed-core)
+mbed_set_c_lib(mbed-core ${MBED_C_LIB})
+mbed_set_printf_lib(mbed-core ${MBED_PRINTF_LIB})
+mbed_set_language_standard(mbed-core)
+mbed_set_profile_options(mbed-core ${MBED_TOOLCHAIN})
 
-set_target_properties(mbed-os
+set_target_properties(mbed-core
     PROPERTIES
         MBED_TARGET_LABELS "${MBED_TARGET_LABELS}"
 )
 
-target_compile_definitions(mbed-os
+target_compile_definitions(mbed-core
     PUBLIC
         ${MBED_TARGET_DEFINITIONS}
         ${MBED_CONFIG_DEFINITIONS}
 )
 
 # Include mbed.h and config from generate folder
-target_include_directories(mbed-os
+target_include_directories(mbed-core
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 # 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_library(mbed-device_key INTERFACE)
 
 add_subdirectory(cmsis)
 add_subdirectory(drivers)
@@ -122,7 +124,7 @@ function(mbed_set_mbed_target_linker_script target)
         )
     elseif(MBED_TOOLCHAIN STREQUAL "ARM")
         set(CMAKE_PRE_BUILD_COMMAND COMMAND "")
-        target_link_options(mbed-os
+        target_link_options(mbed-core
             PUBLIC
                 "--scatter=${mbed_target_linker_script}"
         )

cmsis/CMSIS_5/CMSIS/RTOS2/CMakeLists.txt

@@ -3,12 +3,12 @@
 
 add_subdirectory(RTX)
 
-target_include_directories(mbed-os
+target_include_directories(mbed-core
     PUBLIC
         Include
 )
 
-target_sources(mbed-os
+target_sources(mbed-core
     PRIVATE
         Source/os_systick.c
         Source/os_tick_ptim.c

cmsis/CMSIS_5/CMSIS/RTOS2/RTX/CMakeLists.txt

@@ -19,7 +19,7 @@ function(_mbed_get_cortex_m_exception_handlers toolchain_dir)
             set(STARTUP_RTX_FILE TARGET_RTOS_M4_M7/irq_cm4f.S)
         endif()
 
-        target_sources(mbed-os
+        target_sources(mbed-core
             PRIVATE
                 Source/${toolchain_dir}/${STARTUP_RTX_FILE}
         )
@@ -29,7 +29,7 @@ endfunction()
 function(_mbed_get_cortex_a_exception_handlers)
     foreach(key ${MBED_TARGET_LABELS})
         if(${key} STREQUAL CORTEX_A)
-            target_sources(mbed-os PRIVATE Config/TARGET_CORTEX_A/handlers.c)
+            target_sources(mbed-core PRIVATE Config/TARGET_CORTEX_A/handlers.c)
         endif()
     endforeach()
 endfunction()
@@ -44,15 +44,15 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
     _mbed_get_cortex_m_exception_handlers(TOOLCHAIN_IAR)
 endif()
 
-target_include_directories(mbed-os
+target_include_directories(mbed-core
     PUBLIC
         Config
         Include
         Include1
         Source
 )
 
-target_sources(mbed-os
+target_sources(mbed-core
     PRIVATE
         Config/RTX_Config.c
 

cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/CMakeLists.txt

@@ -1,12 +1,12 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-os
+target_include_directories(mbed-core
     PUBLIC
         Include
 )
 
-target_sources(mbed-os
+target_sources(mbed-core
     PRIVATE
         Source/irq_ctrl_gic.c
 )

cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/CMakeLists.txt

@@ -1,12 +1,12 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_include_directories(mbed-os
+target_include_directories(mbed-core
     PUBLIC
         Include
 )
 
-target_sources(mbed-os
+target_sources(mbed-core
     PRIVATE
         Source/mbed_tz_context.c
 )

cmsis/device/CMakeLists.txt

@@ -4,7 +4,7 @@
 add_subdirectory(RTE)
 add_subdirectory(rtos)
 
-target_include_directories(mbed-os
+target_include_directories(mbed-core
     PUBLIC
         .
 )

cmsis/device/RTE/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
+target_include_directories(mbed-core
     PUBLIC
         include
 )

cmsis/device/rtos/CMakeLists.txt

@@ -2,35 +2,35 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    target_sources(mbed-os
+    target_sources(mbed-core
         PRIVATE
             TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    target_sources(mbed-os
+    target_sources(mbed-core
         PRIVATE
             TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
-    target_sources(mbed-os
+    target_sources(mbed-core
         PRIVATE
             TOOLCHAIN_IAR/mbed_boot_iar.c
     )
 endif()
 
-target_include_directories(mbed-os
+target_include_directories(mbed-core
     PUBLIC
         include
 )
 
-target_sources(mbed-os PRIVATE
+target_sources(mbed-core PRIVATE
     source/mbed_boot.c
     source/mbed_rtos_rtx.c
     source/mbed_rtx_handlers.c
     source/mbed_rtx_idle.cpp
 )
 
-target_compile_definitions(mbed-os
+target_compile_definitions(mbed-core
     PUBLIC
         MBED_CONF_RTOS_PRESENT=1
 )

connectivity/CMakeLists.txt

@@ -2,29 +2,29 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # 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_library(mbed-802.15.4-rf INTERFACE)
+add_library(mbed-ble INTERFACE)
+add_library(mbed-ble-blue_nrg INTERFACE)
+add_library(mbed-ble-cordio INTERFACE)
+add_library(mbed-ble-cordio_ll INTERFACE)
+add_library(mbed-cellular INTERFACE)
+add_library(mbed-coap INTERFACE)
+add_library(mbed-emac INTERFACE)
+add_library(mbed-lorawan INTERFACE)
+add_library(mbed-lwipstack INTERFACE)
+add_library(mbed-mbedtls INTERFACE)
+add_library(mbed-mbedtls-cryptocell310 INTERFACE)
+add_library(mbed-nanostack INTERFACE)
+add_library(mbed-nanostack-coap_service INTERFACE)
+add_library(mbed-nanostack-mbed_mesh_api INTERFACE)
+add_library(mbed-nanostack-hal_mbed_cmsis_rtos INTERFACE)
+add_library(mbed-nanostack-sal_stack INTERFACE)
+add_library(mbed-nanostack-sal_stack-event_loop INTERFACE)
+add_library(mbed-nanostack-libservice INTERFACE)
+add_library(mbed-netsocket INTERFACE)
+add_library(mbed-nfc INTERFACE)
+add_library(mbed-ppp INTERFACE)
+add_library(mbed-wifi INTERFACE)
 
 
 add_subdirectory(FEATURE_BLE)

connectivity/FEATURE_BLE/CMakeLists.txt

@@ -4,7 +4,7 @@
 add_subdirectory(libraries)
 add_subdirectory(source)
 
-target_include_directories(mbed-os-ble
+target_include_directories(mbed-ble
     INTERFACE
         .
         include
@@ -21,7 +21,7 @@ target_include_directories(mbed-os-ble
         source
 )
 
-target_compile_definitions(mbed-os-ble
+target_compile_definitions(mbed-ble
     INTERFACE
         MBED_CONF_BLE_PRESENT=1
 )

connectivity/FEATURE_BLE/libraries/CMakeLists.txt

@@ -7,12 +7,12 @@ endif()
 
 add_subdirectory(cordio_stack)
 
-target_include_directories(mbed-os-ble-cordio
+target_include_directories(mbed-ble-cordio
     INTERFACE
         .
 )
 
-target_link_libraries(mbed-os-ble-cordio
+target_link_libraries(mbed-ble-cordio
     INTERFACE
-        mbed-os-ble
+        mbed-ble
 )

connectivity/FEATURE_BLE/libraries/TARGET_CORDIO_LL/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-ble-cordio_ll
+target_include_directories(mbed-ble-cordio_ll
     INTERFACE
         .
         ./stack
@@ -22,7 +22,7 @@ target_include_directories(mbed-os-ble-cordio_ll
         ./stack_adaptation
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-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
@@ -45,13 +45,13 @@ target_sources(mbed-os-ble-cordio_ll
         stack/controller/sources/ble/bb/bb_ble_whitelist.c
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-ble-cordio_ll
     INTERFACE
         stack/controller/sources/ble/init/init.c
         stack/controller/sources/ble/init/init_ctr.c
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-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
@@ -145,7 +145,7 @@ target_sources(mbed-os-ble-cordio_ll
         stack/controller/sources/ble/lctr/lctr_sm_llcp_slave_phy.c
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-ble-cordio_ll
     INTERFACE
         stack/controller/sources/ble/lhci/lhci_cmd.c
         stack/controller/sources/ble/lhci/lhci_cmd_adv_master.c
@@ -224,7 +224,7 @@ target_sources(mbed-os-ble-cordio_ll
         stack/controller/sources/ble/lhci/lhci_main_iso.c
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-ble-cordio_ll
     INTERFACE
         stack/controller/sources/ble/ll/ll_init.c
         stack/controller/sources/ble/ll/ll_init_adv_master.c
@@ -275,7 +275,7 @@ target_sources(mbed-os-ble-cordio_ll
         stack/controller/sources/ble/ll/ll_math.c
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-ble-cordio_ll
     INTERFACE
         stack/controller/sources/ble/lmgr/lmgr_events.c
         stack/controller/sources/ble/lmgr/lmgr_main.c
@@ -290,14 +290,14 @@ target_sources(mbed-os-ble-cordio_ll
         stack/controller/sources/ble/lmgr/lmgr_main_slave.c
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-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-ble-cordio_ll
+target_sources(mbed-ble-cordio_ll
     INTERFACE
         stack/controller/sources/common/bb/bb_main.c
 
@@ -307,7 +307,7 @@ target_sources(mbed-os-ble-cordio_ll
         stack/controller/sources/common/sch/sch_main.c
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-ble-cordio_ll
     INTERFACE
         stack/thirdparty/nordic-bsp/components/boards/boards.c
 
@@ -316,12 +316,12 @@ target_sources(mbed-os-ble-cordio_ll
         stack/thirdparty/uecc/uECC_ll.c
 )
 
-target_sources(mbed-os-ble-cordio_ll
+target_sources(mbed-ble-cordio_ll
     INTERFACE
         stack_adaptation/custom_chci_tr.cpp
 )
 
-target_link_libraries(mbed-os-ble-cordio_ll
+target_link_libraries(mbed-ble-cordio_ll
     INTERFACE
-        mbed-os-ble-cordio
+        mbed-ble-cordio
 )