CMake STM32: fix mbed-stm linking libs names

0xc0170 · 0xc0170 · commit 6bf459e3ceae · 2021-02-10T12:24:10.000Z
diff --git a/targets/TARGET_STM/TARGET_STM32F0/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F0/CMakeLists.txt
@@ -26,4 +26,4 @@ target_sources(mbed-stm32f0
         spi_api.c
 )
 
-target_link_libraries(mbed-stm32f0 INTERFACE STM mbed-stm32f0cube-fw)
+target_link_libraries(mbed-stm32f0 INTERFACE mbed-stm mbed-stm32f0cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32F1/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F1/CMakeLists.txt
@@ -22,4 +22,4 @@ target_include_directories(mbed-stm32f1
         .
 )
 
-target_link_libraries(mbed-stm32f1 INTERFACE STM mbed-stm32f1cube-fw)
+target_link_libraries(mbed-stm32f1 INTERFACE mbed-stm mbed-stm32f1cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32F2/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F2/CMakeLists.txt
@@ -26,4 +26,4 @@ target_include_directories(mbed-stm32f2
         ./STM32Cube_FW/STM32F2xx_HAL_Driver/Legacy
 )
 
-target_link_libraries(mbed-stm32f2 INTERFACE STM mbed-stm32f2cube-fw)
+target_link_libraries(mbed-stm32f2 INTERFACE mbed-stm mbed-stm32f2cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32F3/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F3/CMakeLists.txt
@@ -26,4 +26,4 @@ target_sources(mbed-stm32f3
         spi_api.c
 )
 
-target_link_libraries(mbed-stm32f3 INTERFACE STM mbed-stm32cube-fw)
+target_link_libraries(mbed-stm32f3 INTERFACE mbed-stm mbed-stm32cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32F7/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F7/CMakeLists.txt
@@ -26,4 +26,4 @@ target_include_directories(mbed-stm32f7
         .
 )
 
-target_link_libraries(mbed-stm32f7 INTERFACE STM mbed-stm32f7cube-fw)
+target_link_libraries(mbed-stm32f7 INTERFACE mbed-stm mbed-stm32f7cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32G0/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32G0/CMakeLists.txt
@@ -27,4 +27,4 @@ target_include_directories(mbed-stm32g0
         .
 )
 
-target_link_libraries(mbed-stm32g0 INTERFACE STM mbed-stm32g0cube-few)
+target_link_libraries(mbed-stm32g0 INTERFACE mbed-stm mbed-stm32g0cube-few)
diff --git a/targets/TARGET_STM/TARGET_STM32G4/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32G4/CMakeLists.txt
@@ -28,4 +28,4 @@ target_include_directories(mbed-stm32g4
         .
 )
 
-target_link_libraries(mbed-stm32g4 INTERFACE STM mbed-stm32g4cube-fw)
+target_link_libraries(mbed-stm32g4 INTERFACE mbed-stm mbed-stm32g4cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32H7/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32H7/CMakeLists.txt
@@ -25,4 +25,4 @@ target_include_directories(mbed-stm32h7
         .
 )
 
-target_link_libraries(mbed-stm32h7 INTERFACE STM mbed-stm32h7cube-fw)
+target_link_libraries(mbed-stm32h7 INTERFACE mbed-stm mbed-stm32h7cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32L0/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L0/CMakeLists.txt
@@ -27,4 +27,4 @@ target_include_directories(mbed-stm32l0
         .
 )
 
-target_link_libraries(mbed-stm32l0 INTERFACE STM mbed-stm32l0cube-fw)
+target_link_libraries(mbed-stm32l0 INTERFACE mbed-stm mbed-stm32l0cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32L4/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L4/CMakeLists.txt
@@ -33,4 +33,4 @@ target_include_directories(mbed-stm32l4
 )
 
 add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)
-target_link_libraries(mbed-stm32l4 INTERFACE STM mbed-stm32l4cube-fw)
+target_link_libraries(mbed-stm32l4 INTERFACE mbed-stm mbed-stm32l4cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32L5/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32L5/CMakeLists.txt
@@ -25,4 +25,4 @@ target_include_directories(mbed-stm32l5
         .
 )
 
-target_link_libraries(mbed-stm32l5 INTERFACE STM mbed-stm32l5cube-fw)
+target_link_libraries(mbed-stm32l5 INTERFACE mbed-stm mbed-stm32l5cube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt
@@ -23,4 +23,4 @@ target_include_directories(mbed-stm32wb
         .
 )
 
-target_link_libraries(mbed-stm32wb INTERFACE STM mbed-stm32wbcube-fw)
+target_link_libraries(mbed-stm32wb INTERFACE mbed-stm mbed-stm32wbcube-fw)
diff --git a/targets/TARGET_STM/TARGET_STM32WL/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32WL/CMakeLists.txt
@@ -22,4 +22,4 @@ target_include_directories(mbed-stm32wl
         .
 )
 
-target_link_libraries(mbed-stm32wl INTERFACE STM mbed-stm32wlcube-fw)
+target_link_libraries(mbed-stm32wl INTERFACE mbed-stm mbed-stm32wlcube-fw)

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ target_sources(mbed-stm32f0`
`26`	`26`	`spi_api.c`
`27`	`27`	`)`
`28`	`28`
`29`		`-target_link_libraries(mbed-stm32f0 INTERFACE STM mbed-stm32f0cube-fw)`
	`29`	`+target_link_libraries(mbed-stm32f0 INTERFACE mbed-stm mbed-stm32f0cube-fw)`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@ target_include_directories(mbed-stm32f1`
`22`	`22`	`.`
`23`	`23`	`)`
`24`	`24`
`25`		`-target_link_libraries(mbed-stm32f1 INTERFACE STM mbed-stm32f1cube-fw)`
	`25`	`+target_link_libraries(mbed-stm32f1 INTERFACE mbed-stm mbed-stm32f1cube-fw)`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ target_include_directories(mbed-stm32f2`
`26`	`26`	`./STM32Cube_FW/STM32F2xx_HAL_Driver/Legacy`
`27`	`27`	`)`
`28`	`28`
`29`		`-target_link_libraries(mbed-stm32f2 INTERFACE STM mbed-stm32f2cube-fw)`
	`29`	`+target_link_libraries(mbed-stm32f2 INTERFACE mbed-stm mbed-stm32f2cube-fw)`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@ target_include_directories(mbed-stm32g0`
`27`	`27`	`.`
`28`	`28`	`)`
`29`	`29`
`30`		`-target_link_libraries(mbed-stm32g0 INTERFACE STM mbed-stm32g0cube-few)`
	`30`	`+target_link_libraries(mbed-stm32g0 INTERFACE mbed-stm mbed-stm32g0cube-few)`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@ target_include_directories(mbed-stm32g4`
`28`	`28`	`.`
`29`	`29`	`)`
`30`	`30`
`31`		`-target_link_libraries(mbed-stm32g4 INTERFACE STM mbed-stm32g4cube-fw)`
	`31`	`+target_link_libraries(mbed-stm32g4 INTERFACE mbed-stm mbed-stm32g4cube-fw)`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,4 @@ target_include_directories(mbed-stm32h7`
`25`	`25`	`.`
`26`	`26`	`)`
`27`	`27`
`28`		`-target_link_libraries(mbed-stm32h7 INTERFACE STM mbed-stm32h7cube-fw)`
	`28`	`+target_link_libraries(mbed-stm32h7 INTERFACE mbed-stm mbed-stm32h7cube-fw)`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,4 @@ target_include_directories(mbed-stm32l4`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`add_subdirectory(STM32Cube_FW EXCLUDE_FROM_ALL)`
`36`		`-target_link_libraries(mbed-stm32l4 INTERFACE STM mbed-stm32l4cube-fw)`
	`36`	`+target_link_libraries(mbed-stm32l4 INTERFACE mbed-stm mbed-stm32l4cube-fw)`