Skip to content

Commit bfb36b6

Browse files
0xc01700xc0170
committed
CMake ARM FM: fix targets naming
1 parent 302c860 commit bfb36b6

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

‎targets/TARGET_ARM_FM/CMakeLists.txt‎

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

4-
add_library(ARM_FM INTERFACE)
4+
add_library(mbed-arm-fm INTERFACE)
55

66
add_subdirectory(TARGET_FVP_MPS2 EXCLUDE_FROM_ALL)
77

8-
target_include_directories(ARM_FM
8+
target_include_directories(mbed-arm-fm
99
INTERFACE
1010
.
1111
)

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ add_subdirectory(TARGET_FVP_MPS2_M3 EXCLUDE_FROM_ALL)
77
add_subdirectory(TARGET_FVP_MPS2_M4 EXCLUDE_FROM_ALL)
88
add_subdirectory(TARGET_FVP_MPS2_M7 EXCLUDE_FROM_ALL)
99

10-
add_library(FVP_MPS2 INTERFACE)
10+
add_library(mbed-fvp-mps2 INTERFACE)
1111

12-
target_include_directories(FVP_MPS2
12+
target_include_directories(mbed-fvp-mps2
1313
INTERFACE
1414
.
1515
drivers
1616
SDK
1717
)
1818

19-
target_sources(FVP_MPS2
19+
target_sources(mbed-fvp-mps2
2020
INTERFACE
2121
analogin_api.c
2222
flash_api.c

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt‎

Lines changed: 5 additions & 5 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-
add_library(FVP_MPS2_M0 INTERFACE)
4+
add_library(mbed-fvp-mps2-m0 INTERFACE)
55

66
if(${MBED_TOOLCHAIN} STREQUAL "ARM")
77
set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct)
@@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
1212
endif()
1313

14-
mbed_set_linker_script(FVP_MPS2_M0 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
14+
mbed_set_linker_script(mbed-fvp-mps2-m0 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
1515

16-
target_include_directories(FVP_MPS2_M0
16+
target_include_directories(mbed-fvp-mps2-m0
1717
INTERFACE
1818
device
1919
)
2020

21-
target_sources(FVP_MPS2_M0
21+
target_sources(mbed-fvp-mps2-m0
2222
INTERFACE
2323
device/system_CMSDK_CM0.c
2424
${STARTUP_FILE}
2525
)
2626

27-
target_link_libraries(FVP_MPS2_M0 INTERFACE FVP_MPS2 ARM_FM)
27+
target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2 mbed-arm-fm)

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt‎

Lines changed: 5 additions & 5 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-
add_library(FVP_MPS2_M0P INTERFACE)
4+
add_library(mbed-fvp-mps2-m0p INTERFACE)
55

66
if(${MBED_TOOLCHAIN} STREQUAL "ARM")
77
set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct)
@@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
1212
endif()
1313

14-
mbed_set_linker_script(FVP_MPS2_M0P ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
14+
mbed_set_linker_script(mbed-fvp-mps2-m0p ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
1515

16-
target_include_directories(FVP_MPS2_M0P
16+
target_include_directories(mbed-fvp-mps2-m0p
1717
INTERFACE
1818
device
1919
)
2020

21-
target_sources(FVP_MPS2_M0P
21+
target_sources(mbed-fvp-mps2-m0p
2222
INTERFACE
2323
device/system_CMSDK_CM0plus.c
2424
${STARTUP_FILE}
2525
)
2626

27-
target_link_libraries(FVP_MPS2_M0P INTERFACE FVP_MPS2 ARM_FM)
27+
target_link_libraries(mbed-fvp-mps2-m0p INTERFACE mbed-fvp-mps2 mbed-arm-fm)

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt‎

Lines changed: 5 additions & 5 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-
add_library(FVP_MPS2_M3 INTERFACE)
4+
add_library(mbed-fvp-mps2-m3 INTERFACE)
55

66
if(${MBED_TOOLCHAIN} STREQUAL "ARM")
77
set(LINKER_FILE device/TOOLCHAIN_ARM_STD/MPS2.sct)
@@ -11,17 +11,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
1212
endif()
1313

14-
mbed_set_linker_script(FVP_MPS2_M3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
14+
mbed_set_linker_script(mbed-fvp-mps2-m3 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
1515

16-
target_include_directories(FVP_MPS2_M3
16+
target_include_directories(mbed-fvp-mps2-m3
1717
INTERFACE
1818
device
1919
)
2020

21-
target_sources(FVP_MPS2_M3
21+
target_sources(mbed-fvp-mps2-m3
2222
INTERFACE
2323
device/system_CMSDK_CM3.c
2424
${STARTUP_FILE}
2525
)
2626

27-
target_link_libraries(FVP_MPS2_M3 INTERFACE FVP_MPS2 ARM_FM)
27+
target_link_libraries(mbed-fvp-mps2-m3 INTERFACE mbed-fvp-mps2 mbed-arm-fm)

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt‎

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

4-
add_library(FVP_MPS2_M4 INTERFACE)
4+
add_library(mbed-fvp-mps2-m4 INTERFACE)
55

6-
target_include_directories(FVP_MPS2_M4
6+
target_include_directories(mbed-fvp-mps2-m4
77
INTERFACE
88
device
99
)
@@ -15,17 +15,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1515
set(LINKER_FILE device/TOOLCHAIN_GCC_ARM/MPS2.ld)
1616
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
1717
endif()
18-
mbed_set_linker_script(FVP_MPS2_M4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
18+
mbed_set_linker_script(mbed-fvp-mps2-m4 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
1919

20-
target_include_directories(FVP_MPS2_M4
20+
target_include_directories(mbed-fvp-mps2-m4
2121
INTERFACE
2222
device
2323
)
2424

25-
target_sources(FVP_MPS2_M4
25+
target_sources(mbed-fvp-mps2-m4
2626
INTERFACE
2727
device/system_CMSDK_CM4.c
2828
${STARTUP_FILE}
2929
)
3030

31-
target_link_libraries(FVP_MPS2_M4 INTERFACE FVP_MPS2 ARM_FM)
31+
target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2 mbed-arm-fm)

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt‎

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

4-
add_library(FVP_MPS2_M7 INTERFACE)
4+
add_library(mbed-fvp-mps2-m7 INTERFACE)
55

6-
target_include_directories(FVP_MPS2_M7
6+
target_include_directories(mbed-fvp-mps2-m7
77
INTERFACE
88
device
99
)
@@ -16,17 +16,17 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1616
set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_MPS2.S)
1717
endif()
1818

19-
mbed_set_linker_script(FVP_MPS2_M7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
19+
mbed_set_linker_script(mbed-fvp-mps2-m7 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
2020

21-
target_include_directories(FVP_MPS2_M7
21+
target_include_directories(mbed-fvp-mps2-m7
2222
INTERFACE
2323
device
2424
)
2525

26-
target_sources(FVP_MPS2_M7
26+
target_sources(mbed-fvp-mps2-m7
2727
INTERFACE
2828
device/system_CMSDK_CM7.c
2929
${STARTUP_FILE}
3030
)
3131

32-
target_link_libraries(FVP_MPS2_M7 INTERFACE FVP_MPS2 ARM_FM)
32+
target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2 mbed-arm-fm)

0 commit comments

Comments
 (0)