CMake: remove util function, link object libs regularly

Author: 0xc0170

CMakeLists.txt

@@ -7,7 +7,6 @@ cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
 
 include(${MBED_CONFIG_PATH}/mbed_config.cmake)
 include(tools/cmake/set_linker_script.cmake)
-include(tools/cmake/util.cmake)
 
 # Ensure the words that make up the Mbed target name are separated with a hyphen, lowercase, and with the `mbed-` prefix.
 set(MBED_TARGET_CONVERTED "" CACHE STRING "" FORCE)
@@ -21,7 +20,7 @@ add_library(mbed-core-obj OBJECT EXCLUDE_FROM_ALL)
 add_library(mbed-os INTERFACE)
 add_library(mbed-os-obj OBJECT EXCLUDE_FROM_ALL)
 
-target_sources(mbed-os INTERFACE $<TARGET_OBJECTS:mbed-os-obj>)
+target_sources(mbed-os INTERFACE $<TARGET_OBJECTS:mbed-os-obj> $<TARGET_OBJECTS:mbed-rtos-obj>)
 
 target_link_libraries(mbed-os
     INTERFACE
@@ -131,7 +130,7 @@ add_library(mbed-device_key INTERFACE)
 add_library(mbed-rtos INTERFACE)
 add_library(mbed-rtos-obj OBJECT)
 
-mbed_attach_object_lib_with_interface_lib(mbed-rtos)
+target_link_libraries(mbed-rtos-obj mbed-rtos mbed-core)
 
 add_subdirectory(cmsis)
 add_subdirectory(drivers)

cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/CMakeLists.txt

@@ -1,17 +1,16 @@
 # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-cmsis-cortex-a INTERFACE)
-add_library(mbed-cmsis-cortex-a-obj OBJECT)
+add_library(mbed-cmsis-cortex-a OBJECT)
 
 target_include_directories(mbed-cmsis-cortex-a
-    INTERFACE
+    PUBLIC
         Include
 )
 
-target_sources(mbed-cmsis-cortex-a-obj
+target_sources(mbed-cmsis-cortex-a
     PRIVATE
         Source/irq_ctrl_gic.c
 )
 
-mbed_attach_object_lib_with_interface_lib(mbed-cmsis-cortex-a)
+target_link_libraries(mbed-cmsis-cortex-a)

cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/CMakeLists.txt

@@ -1,17 +1,14 @@
 # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-cmsis-cortex-m INTERFACE)
-add_library(mbed-cmsis-cortex-m-obj OBJECT)
+add_library(mbed-cmsis-cortex-m OBJECT)
 
 target_include_directories(mbed-cmsis-cortex-m
-    INTERFACE
+    PUBLIC
         Include
 )
 
-target_sources(mbed-cmsis-cortex-m-obj
+target_sources(mbed-cmsis-cortex-m
     PRIVATE
         Source/mbed_tz_context.c
 )
-
-mbed_attach_object_lib_with_interface_lib(mbed-cmsis-cortex-m)

cmsis/device/rtos/CMakeLists.txt

@@ -32,6 +32,3 @@ target_compile_definitions(mbed-rtos
 )
 
 target_include_directories(mbed-rtos INTERFACE $<TARGET_PROPERTY:${MBED_TARGET_CONVERTED},INTERFACE_INCLUDE_DIRECTORIES>)
-
-
-target_link_libraries(mbed-rtos-obj PRIVATE mbed-core)

events/CMakeLists.txt

@@ -1,8 +1,6 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-include(${MBED_PATH}/tools/cmake/util.cmake)
-
 add_library(mbed-events OBJECT)
 
 target_include_directories(mbed-events