CMake STM32: fix missed targets with prefix

0xc0170 · 0xc0170 · commit ef98060d94b6 · 2021-02-10T12:14:49.000Z
diff --git a/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(nucleo-f303re INTERFACE)
+add_library(mbed-nucleo-f303re INTERFACE)
 
-target_sources(nucleo-f303re
+target_sources(mbed-nucleo-f303re
     INTERFACE
         PeripheralPins.c
 )
 
-target_include_directories(nucleo-f303re
+target_include_directories(mbed-nucleo-f303re
     INTERFACE
         .
 )
 
-target_link_libraries(nucleo-f303re INTERFACE mbed-stm32f303xe)
+target_link_libraries(mbed-nucleo-f303re INTERFACE mbed-stm32f303xe)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_3G/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_3G/CMakeLists.txt
@@ -1,18 +1,18 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(wio-3g INTERFACE)
+add_library(mbed-wio-3g INTERFACE)
 
-target_sources(wio-3g
+target_sources(mbed-wio-3g
     INTERFACE
         PeripheralPins.c
         system_clock.c
         ONBOARD_QUECTEL_UG96.cpp
 )
 
-target_include_directories(wio-3g
+target_include_directories(mbed-wio-3g
     INTERFACE
         .
 )
 
-target_link_libraries(wio-3g INTERFACE mbed-stm32f439xi)
+target_link_libraries(mbed-wio-3g INTERFACE mbed-stm32f439xi)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_BG96/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_BG96/CMakeLists.txt
@@ -1,18 +1,18 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(wio-bg96 INTERFACE)
+add_library(mbed-wio-bg96 INTERFACE)
 
-target_sources(wio-bg96
+target_sources(mbed-wio-bg96
     INTERFACE
         PeripheralPins.c
         system_clock.c
         ONBOARD_QUECTEL_BG96.cpp
 )
 
-target_include_directories(wio-bg96
+target_include_directories(mbed-wio-bg96
     INTERFACE
         .
 )
 
-target_link_libraries(wio-bg96 INTERFACE mbed-stm32f439xi)
+target_link_libraries(mbed-wio-bg96 INTERFACE mbed-stm32f439xi)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F469xI/TARGET_SDP_K1/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F469xI/TARGET_SDP_K1/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(sdp-k1 INTERFACE)
+add_library(mbed-sdp-k1 INTERFACE)
 
-target_sources(sdp-k1
+target_sources(mbed-sdp-k1
     INTERFACE
         PeripheralPins.c
         system_clock.c
 )
 
-target_include_directories(sdp-k1
+target_include_directories(mbed-sdp-k1
     INTERFACE
         .
 )
- target_link_libraries(sdp-k1 INTERFACE mbed-stm32f469xi)
+ target_link_libraries(mbed-sdp-k1 INTERFACE mbed-stm32f469xi)
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H7A3xIQ/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H7A3xIQ/CMakeLists.txt
@@ -11,19 +11,19 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE TOOLCHAIN_ARM/stm32h7a3xxq.sct)
 endif()
 
-add_library(mbed-stm32h7A3xiq INTERFACE)
+add_library(mbed-stm32h7a3xiq INTERFACE)
 
-target_sources(mbed-stm32h7A3xiq
+target_sources(mbed-stm32h7a3xiq
     INTERFACE
         system_clock.c
         ${STARTUP_FILE}
 )
 
-target_include_directories(mbed-stm32h7A3xiq
+target_include_directories(mbed-stm32h7a3xiq
     INTERFACE
         .
 )
 
-mbed_set_linker_script(mbed-stm32h7A3xiq ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-stm32h7a3xiq ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(mbed-stm32h7A3xiq INTERFACE mbed-stm32h7)
+target_link_libraries(mbed-stm32h7a3xiq INTERFACE mbed-stm32h7)
diff --git a/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/CMakeLists.txt
@@ -9,9 +9,9 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE device/TOOLCHAIN_ARM/stm32l151rc.sct)
 endif()
 
-add_library(xdot-l151cc INTERFACE)
+add_library(mbed-xdot-l151cc INTERFACE)
 
-target_sources(xdot-l151cc
+target_sources(mbed-xdot-l151cc
     INTERFACE
         PeripheralPins.c
         device/system_clock.c
@@ -20,12 +20,12 @@ target_sources(xdot-l151cc
         ${STARTUP_FILE}
 )
 
-target_include_directories(xdot-l151cc
+target_include_directories(mbed-xdot-l151cc
     INTERFACE
         .
         device
 )
 
-mbed_set_linker_script(xdot-l151cc ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-xdot-l151cc ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(xdot-l151cc INTERFACE mbed-stm32l1)
+target_link_libraries(mbed-xdot-l151cc INTERFACE mbed-stm32l1)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/CMakeLists.txt
@@ -114,4 +114,4 @@ target_sources(mbed-stm32l4xx-hal-driver
         stm32l4xx_ll_utils.c
 )
 add_subdirectory(Legacy EXCLUDE_FROM_ALL)
-target_link_libraries(mbed-stm32l4xx-hal-driver INTERFACE mbed-stm32l4xxlegacy-hal-driver)
+target_link_libraries(mbed-stm32l4xx-hal-driver INTERFACE mbed-stm32l4xx-legacy-hal-driver)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/Legacy/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/Legacy/CMakeLists.txt
@@ -1,14 +1,14 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_library(mbed-stm32l4xxlegacy-hal-driver INTERFACE)
+add_library(mbed-stm32l4xx-legacy-hal-driver INTERFACE)
 
-target_include_directories(mbed-stm32l4xxlegacy-hal-driver
+target_include_directories(mbed-stm32l4xx-legacy-hal-driver
     INTERFACE
         .
 )
 
-target_sources(mbed-stm32l4xxlegacy-hal-driver
+target_sources(mbed-stm32l4xx-legacy-hal-driver
     INTERFACE
         stm32l4xx_hal_can_legacy.c
 )

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`# Copyright (c) 2020 ARM Limited. All rights reserved.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`		`-add_library(nucleo-f303re INTERFACE)`
	`4`	`+add_library(mbed-nucleo-f303re INTERFACE)`
`5`	`5`
`6`		`-target_sources(nucleo-f303re`
	`6`	`+target_sources(mbed-nucleo-f303re`
`7`	`7`	`INTERFACE`
`8`	`8`	`PeripheralPins.c`
`9`	`9`	`)`
`10`	`10`
`11`		`-target_include_directories(nucleo-f303re`
	`11`	`+target_include_directories(mbed-nucleo-f303re`
`12`	`12`	`INTERFACE`
`13`	`13`	`.`
`14`	`14`	`)`
`15`	`15`
`16`		`-target_link_libraries(nucleo-f303re INTERFACE mbed-stm32f303xe)`
	`16`	`+target_link_libraries(mbed-nucleo-f303re INTERFACE mbed-stm32f303xe)`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`# Copyright (c) 2021 ARM Limited. All rights reserved.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`		`-add_library(wio-3g INTERFACE)`
	`4`	`+add_library(mbed-wio-3g INTERFACE)`
`5`	`5`
`6`		`-target_sources(wio-3g`
	`6`	`+target_sources(mbed-wio-3g`
`7`	`7`	`INTERFACE`
`8`	`8`	`PeripheralPins.c`
`9`	`9`	`system_clock.c`
`10`	`10`	`ONBOARD_QUECTEL_UG96.cpp`
`11`	`11`	`)`
`12`	`12`
`13`		`-target_include_directories(wio-3g`
	`13`	`+target_include_directories(mbed-wio-3g`
`14`	`14`	`INTERFACE`
`15`	`15`	`.`
`16`	`16`	`)`
`17`	`17`
`18`		`-target_link_libraries(wio-3g INTERFACE mbed-stm32f439xi)`
	`18`	`+target_link_libraries(mbed-wio-3g INTERFACE mbed-stm32f439xi)`
Original file line number	Diff line number	Diff line change
`@@ -114,4 +114,4 @@ target_sources(mbed-stm32l4xx-hal-driver`
`114`	`114`	`stm32l4xx_ll_utils.c`
`115`	`115`	`)`
`116`	`116`	`add_subdirectory(Legacy EXCLUDE_FROM_ALL)`
`117`		`-target_link_libraries(mbed-stm32l4xx-hal-driver INTERFACE mbed-stm32l4xxlegacy-hal-driver)`
	`117`	`+target_link_libraries(mbed-stm32l4xx-hal-driver INTERFACE mbed-stm32l4xx-legacy-hal-driver)`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`# Copyright (c) 2020 ARM Limited. All rights reserved.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`		`-add_library(mbed-stm32l4xxlegacy-hal-driver INTERFACE)`
	`4`	`+add_library(mbed-stm32l4xx-legacy-hal-driver INTERFACE)`
`5`	`5`
`6`		`-target_include_directories(mbed-stm32l4xxlegacy-hal-driver`
	`6`	`+target_include_directories(mbed-stm32l4xx-legacy-hal-driver`
`7`	`7`	`INTERFACE`
`8`	`8`	`.`
`9`	`9`	`)`
`10`	`10`
`11`		`-target_sources(mbed-stm32l4xxlegacy-hal-driver`
	`11`	`+target_sources(mbed-stm32l4xx-legacy-hal-driver`
`12`	`12`	`INTERFACE`
`13`	`13`	`stm32l4xx_hal_can_legacy.c`
`14`	`14`	`)`