Skip to content

Commit fee3e9f

Browse files
0xc01700xc0170
authored
Merge pull request #13803 from hugueskamba/hk_cmake_rename_targets
CMake: Rename CMake targets
2 parents 37f4670 + b1512ce commit fee3e9f

File tree

257 files changed

+623
-623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+623
-623
lines changed

‎CMakeLists.txt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ endif()
1313
include(${MBED_ROOT}/tools/cmake/core.cmake)
1414
include(${MBED_ROOT}/tools/cmake/profile.cmake)
1515

16-
add_library(mbed-os OBJECT)
16+
add_library(mbed-core OBJECT)
17+
# TODO CMAKE: Replace mbed-os by a new one that will include mbed-core and mbed-rtos
18+
add_library(mbed-os ALIAS mbed-core)
1719

1820
# Validate selected C library type
1921
# The C library type selected has to match the library that the target can support
@@ -43,34 +45,34 @@ if(NOT ${MBED_PRINTF_LIB} IN_LIST MBED_PRINTF_LIB_TYPES)
4345
)
4446
endif()
4547

46-
mbed_set_cpu_core_options(mbed-os ${MBED_TOOLCHAIN})
47-
mbed_set_toolchain_options(mbed-os)
48-
mbed_set_c_lib(mbed-os ${MBED_C_LIB})
49-
mbed_set_printf_lib(mbed-os ${MBED_PRINTF_LIB})
50-
mbed_set_language_standard(mbed-os)
51-
mbed_set_profile_options(mbed-os ${MBED_TOOLCHAIN})
48+
mbed_set_cpu_core_options(mbed-core ${MBED_TOOLCHAIN})
49+
mbed_set_toolchain_options(mbed-core)
50+
mbed_set_c_lib(mbed-core ${MBED_C_LIB})
51+
mbed_set_printf_lib(mbed-core ${MBED_PRINTF_LIB})
52+
mbed_set_language_standard(mbed-core)
53+
mbed_set_profile_options(mbed-core ${MBED_TOOLCHAIN})
5254

53-
set_target_properties(mbed-os
55+
set_target_properties(mbed-core
5456
PROPERTIES
5557
MBED_TARGET_LABELS "${MBED_TARGET_LABELS}"
5658
)
5759

58-
target_compile_definitions(mbed-os
60+
target_compile_definitions(mbed-core
5961
PUBLIC
6062
${MBED_TARGET_DEFINITIONS}
6163
${MBED_CONFIG_DEFINITIONS}
6264
)
6365

6466
# Include mbed.h and config from generate folder
65-
target_include_directories(mbed-os
67+
target_include_directories(mbed-core
6668
PUBLIC
6769
${CMAKE_CURRENT_SOURCE_DIR}
6870
)
6971

7072
# TODO CMake: This component is made visible here so its source files in
7173
# drivers/ can be added and it can be linked against by libraries in storage/.
7274
# Should the source files be moved from drivers/ to storage/ ?
73-
add_library(mbed-os-device_key INTERFACE)
75+
add_library(mbed-device_key INTERFACE)
7476

7577
add_subdirectory(cmsis)
7678
add_subdirectory(drivers)
@@ -111,7 +113,7 @@ function(mbed_set_mbed_target_linker_script target)
111113
)
112114
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
113115
set(CMAKE_PRE_BUILD_COMMAND COMMAND "")
114-
target_link_options(mbed-os
116+
target_link_options(mbed-core
115117
PUBLIC
116118
"--scatter=${mbed_target_linker_script}"
117119
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
add_subdirectory(RTX)
55

6-
target_include_directories(mbed-os
6+
target_include_directories(mbed-core
77
PUBLIC
88
Include
99
)
1010

11-
target_sources(mbed-os
11+
target_sources(mbed-core
1212
PRIVATE
1313
Source/os_systick.c
1414
Source/os_tick_ptim.c

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function(_mbed_get_cortex_m_exception_handlers toolchain_dir)
1919
set(STARTUP_RTX_FILE TARGET_RTOS_M4_M7/irq_cm4f.S)
2020
endif()
2121

22-
target_sources(mbed-os
22+
target_sources(mbed-core
2323
PRIVATE
2424
Source/${toolchain_dir}/${STARTUP_RTX_FILE}
2525
)
@@ -29,7 +29,7 @@ endfunction()
2929
function(_mbed_get_cortex_a_exception_handlers)
3030
foreach(key ${MBED_TARGET_LABELS})
3131
if(${key} STREQUAL CORTEX_A)
32-
target_sources(mbed-os PRIVATE Config/TARGET_CORTEX_A/handlers.c)
32+
target_sources(mbed-core PRIVATE Config/TARGET_CORTEX_A/handlers.c)
3333
endif()
3434
endforeach()
3535
endfunction()
@@ -44,15 +44,15 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
4444
_mbed_get_cortex_m_exception_handlers(TOOLCHAIN_IAR)
4545
endif()
4646

47-
target_include_directories(mbed-os
47+
target_include_directories(mbed-core
4848
PUBLIC
4949
Config
5050
Include
5151
Include1
5252
Source
5353
)
5454

55-
target_sources(mbed-os
55+
target_sources(mbed-core
5656
PRIVATE
5757
Config/RTX_Config.c
5858

‎cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_A/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
target_include_directories(mbed-os
4+
target_include_directories(mbed-core
55
PUBLIC
66
Include
77
)
88

9-
target_sources(mbed-os
9+
target_sources(mbed-core
1010
PRIVATE
1111
Source/irq_ctrl_gic.c
1212
)

‎cmsis/CMSIS_5/CMSIS/TARGET_CORTEX_M/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
target_include_directories(mbed-os
4+
target_include_directories(mbed-core
55
PUBLIC
66
Include
77
)
88

9-
target_sources(mbed-os
9+
target_sources(mbed-core
1010
PRIVATE
1111
Source/mbed_tz_context.c
1212
)

‎cmsis/device/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
add_subdirectory(RTE)
55
add_subdirectory(rtos)
66

7-
target_include_directories(mbed-os
7+
target_include_directories(mbed-core
88
PUBLIC
99
.
1010
)

‎cmsis/device/RTE/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
target_include_directories(mbed-os
4+
target_include_directories(mbed-core
55
PUBLIC
66
include
77
)

‎cmsis/device/rtos/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
5-
target_sources(mbed-os
5+
target_sources(mbed-core
66
PRIVATE
77
TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c
88
)
99
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
10-
target_sources(mbed-os
10+
target_sources(mbed-core
1111
PRIVATE
1212
TOOLCHAIN_ARM_STD/mbed_boot_arm_std.c
1313
)
1414
elseif(${MBED_TOOLCHAIN} STREQUAL "IAR")
15-
target_sources(mbed-os
15+
target_sources(mbed-core
1616
PRIVATE
1717
TOOLCHAIN_IAR/mbed_boot_iar.c
1818
)
1919
endif()
2020

21-
target_include_directories(mbed-os
21+
target_include_directories(mbed-core
2222
PUBLIC
2323
include
2424
)
2525

26-
target_sources(mbed-os PRIVATE
26+
target_sources(mbed-core PRIVATE
2727
source/mbed_boot.c
2828
source/mbed_rtos_rtx.c
2929
source/mbed_rtx_handlers.c
3030
source/mbed_rtx_idle.cpp
3131
)
3232

33-
target_compile_definitions(mbed-os
33+
target_compile_definitions(mbed-core
3434
PUBLIC
3535
MBED_CONF_RTOS_PRESENT=1
3636
)

‎connectivity/CMakeLists.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# List of all connectivity libraries available.
5-
add_library(mbed-os-802.15.4-rf INTERFACE)
6-
add_library(mbed-os-ble INTERFACE)
7-
add_library(mbed-os-ble-blue_nrg INTERFACE)
8-
add_library(mbed-os-ble-cordio INTERFACE)
9-
add_library(mbed-os-ble-cordio_ll INTERFACE)
10-
add_library(mbed-os-cellular INTERFACE)
11-
add_library(mbed-os-coap INTERFACE)
12-
add_library(mbed-os-emac INTERFACE)
13-
add_library(mbed-os-lorawan INTERFACE)
14-
add_library(mbed-os-lwipstack INTERFACE)
15-
add_library(mbed-os-mbedtls INTERFACE)
16-
add_library(mbed-os-mbedtls-cryptocell310 INTERFACE)
17-
add_library(mbed-os-nanostack INTERFACE)
18-
add_library(mbed-os-nanostack-coap_service INTERFACE)
19-
add_library(mbed-os-nanostack-mbed_mesh_api INTERFACE)
20-
add_library(mbed-os-nanostack-hal_mbed_cmsis_rtos INTERFACE)
21-
add_library(mbed-os-nanostack-sal_stack INTERFACE)
22-
add_library(mbed-os-nanostack-sal_stack-event_loop INTERFACE)
23-
add_library(mbed-os-nanostack-libservice INTERFACE)
24-
add_library(mbed-os-netsocket INTERFACE)
25-
add_library(mbed-os-nfc INTERFACE)
26-
add_library(mbed-os-ppp INTERFACE)
27-
add_library(mbed-os-wifi INTERFACE)
5+
add_library(mbed-802.15.4-rf INTERFACE)
6+
add_library(mbed-ble INTERFACE)
7+
add_library(mbed-ble-blue_nrg INTERFACE)
8+
add_library(mbed-ble-cordio INTERFACE)
9+
add_library(mbed-ble-cordio_ll INTERFACE)
10+
add_library(mbed-cellular INTERFACE)
11+
add_library(mbed-coap INTERFACE)
12+
add_library(mbed-emac INTERFACE)
13+
add_library(mbed-lorawan INTERFACE)
14+
add_library(mbed-lwipstack INTERFACE)
15+
add_library(mbed-mbedtls INTERFACE)
16+
add_library(mbed-mbedtls-cryptocell310 INTERFACE)
17+
add_library(mbed-nanostack INTERFACE)
18+
add_library(mbed-nanostack-coap_service INTERFACE)
19+
add_library(mbed-nanostack-mbed_mesh_api INTERFACE)
20+
add_library(mbed-nanostack-hal_mbed_cmsis_rtos INTERFACE)
21+
add_library(mbed-nanostack-sal_stack INTERFACE)
22+
add_library(mbed-nanostack-sal_stack-event_loop INTERFACE)
23+
add_library(mbed-nanostack-libservice INTERFACE)
24+
add_library(mbed-netsocket INTERFACE)
25+
add_library(mbed-nfc INTERFACE)
26+
add_library(mbed-ppp INTERFACE)
27+
add_library(mbed-wifi INTERFACE)
2828

2929

3030
add_subdirectory(FEATURE_BLE)

‎connectivity/FEATURE_BLE/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
add_subdirectory(libraries)
55
add_subdirectory(source)
66

7-
target_include_directories(mbed-os-ble
7+
target_include_directories(mbed-ble
88
INTERFACE
99
.
1010
include
@@ -21,7 +21,7 @@ target_include_directories(mbed-os-ble
2121
source
2222
)
2323

24-
target_compile_definitions(mbed-os-ble
24+
target_compile_definitions(mbed-ble
2525
INTERFACE
2626
MBED_CONF_BLE_PRESENT=1
2727
)

‎connectivity/FEATURE_BLE/libraries/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ endif()
77

88
add_subdirectory(cordio_stack)
99

10-
target_include_directories(mbed-os-ble-cordio
10+
target_include_directories(mbed-ble-cordio
1111
INTERFACE
1212
.
1313
)
1414

15-
target_link_libraries(mbed-os-ble-cordio
15+
target_link_libraries(mbed-ble-cordio
1616
INTERFACE
17-
mbed-os-ble
17+
mbed-ble
1818
)

‎connectivity/FEATURE_BLE/libraries/TARGET_CORDIO_LL/CMakeLists.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
target_include_directories(mbed-os-ble-cordio_ll
4+
target_include_directories(mbed-ble-cordio_ll
55
INTERFACE
66
.
77
./stack
@@ -22,7 +22,7 @@ target_include_directories(mbed-os-ble-cordio_ll
2222
./stack_adaptation
2323
)
2424

25-
target_sources(mbed-os-ble-cordio_ll
25+
target_sources(mbed-ble-cordio_ll
2626
INTERFACE
2727
stack/controller/sources/ble/bb/bb_ble_adv_master.c
2828
stack/controller/sources/ble/bb/bb_ble_adv_master_ae.c
@@ -45,13 +45,13 @@ target_sources(mbed-os-ble-cordio_ll
4545
stack/controller/sources/ble/bb/bb_ble_whitelist.c
4646
)
4747

48-
target_sources(mbed-os-ble-cordio_ll
48+
target_sources(mbed-ble-cordio_ll
4949
INTERFACE
5050
stack/controller/sources/ble/init/init.c
5151
stack/controller/sources/ble/init/init_ctr.c
5252
)
5353

54-
target_sources(mbed-os-ble-cordio_ll
54+
target_sources(mbed-ble-cordio_ll
5555
INTERFACE
5656
stack/controller/sources/ble/lctr/lctr_act_adv_master.c
5757
stack/controller/sources/ble/lctr/lctr_act_adv_master_ae.c
@@ -145,7 +145,7 @@ target_sources(mbed-os-ble-cordio_ll
145145
stack/controller/sources/ble/lctr/lctr_sm_llcp_slave_phy.c
146146
)
147147

148-
target_sources(mbed-os-ble-cordio_ll
148+
target_sources(mbed-ble-cordio_ll
149149
INTERFACE
150150
stack/controller/sources/ble/lhci/lhci_cmd.c
151151
stack/controller/sources/ble/lhci/lhci_cmd_adv_master.c
@@ -224,7 +224,7 @@ target_sources(mbed-os-ble-cordio_ll
224224
stack/controller/sources/ble/lhci/lhci_main_iso.c
225225
)
226226

227-
target_sources(mbed-os-ble-cordio_ll
227+
target_sources(mbed-ble-cordio_ll
228228
INTERFACE
229229
stack/controller/sources/ble/ll/ll_init.c
230230
stack/controller/sources/ble/ll/ll_init_adv_master.c
@@ -275,7 +275,7 @@ target_sources(mbed-os-ble-cordio_ll
275275
stack/controller/sources/ble/ll/ll_math.c
276276
)
277277

278-
target_sources(mbed-os-ble-cordio_ll
278+
target_sources(mbed-ble-cordio_ll
279279
INTERFACE
280280
stack/controller/sources/ble/lmgr/lmgr_events.c
281281
stack/controller/sources/ble/lmgr/lmgr_main.c
@@ -290,14 +290,14 @@ target_sources(mbed-os-ble-cordio_ll
290290
stack/controller/sources/ble/lmgr/lmgr_main_slave.c
291291
)
292292

293-
target_sources(mbed-os-ble-cordio_ll
293+
target_sources(mbed-ble-cordio_ll
294294
INTERFACE
295295
stack/controller/sources/ble/sch/sch_ble.c
296296
stack/controller/sources/ble/sch/sch_rm.c
297297
stack/controller/sources/ble/sch/sch_tm.c
298298
)
299299

300-
target_sources(mbed-os-ble-cordio_ll
300+
target_sources(mbed-ble-cordio_ll
301301
INTERFACE
302302
stack/controller/sources/common/bb/bb_main.c
303303

@@ -307,7 +307,7 @@ target_sources(mbed-os-ble-cordio_ll
307307
stack/controller/sources/common/sch/sch_main.c
308308
)
309309

310-
target_sources(mbed-os-ble-cordio_ll
310+
target_sources(mbed-ble-cordio_ll
311311
INTERFACE
312312
stack/thirdparty/nordic-bsp/components/boards/boards.c
313313

@@ -316,12 +316,12 @@ target_sources(mbed-os-ble-cordio_ll
316316
stack/thirdparty/uecc/uECC_ll.c
317317
)
318318

319-
target_sources(mbed-os-ble-cordio_ll
319+
target_sources(mbed-ble-cordio_ll
320320
INTERFACE
321321
stack_adaptation/custom_chci_tr.cpp
322322
)
323323

324-
target_link_libraries(mbed-os-ble-cordio_ll
324+
target_link_libraries(mbed-ble-cordio_ll
325325
INTERFACE
326-
mbed-os-ble-cordio
326+
mbed-ble-cordio
327327
)

0 commit comments

Comments
 (0)