CMake Arm FM: fix linking libraries with arm-fm

0xc0170 · hugueskamba · web-flow · commit 26d7b4d9d5d5 · 2021-02-14T19:43:39.000Z
Co-authored-by: Hugues Kamba-Mpiana &lt;41612201+hugueskamba@users.noreply.github.com&gt;
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0/CMakelists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 add_library(mbed-fvp-mps2-m0 INTERFACE)
@@ -24,4 +24,4 @@ target_sources(mbed-fvp-mps2-m0
         ${STARTUP_FILE}
 )
 
-target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2 mbed-arm-fm)
+target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2)
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M0P/CMakelists.txt
@@ -24,4 +24,4 @@ target_sources(mbed-fvp-mps2-m0p
         ${STARTUP_FILE}
 )
 
-target_link_libraries(mbed-fvp-mps2-m0p INTERFACE mbed-fvp-mps2 mbed-arm-fm)
+target_link_libraries(mbed-fvp-mps2-m0p INTERFACE mbed-fvp-mps2)
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M3/CMakelists.txt
@@ -24,4 +24,4 @@ target_sources(mbed-fvp-mps2-m3
         ${STARTUP_FILE}
 )
 
-target_link_libraries(mbed-fvp-mps2-m3 INTERFACE mbed-fvp-mps2 mbed-arm-fm)
+target_link_libraries(mbed-fvp-mps2-m3 INTERFACE mbed-fvp-mps2)
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M4/CMakelists.txt
@@ -28,4 +28,4 @@ target_sources(mbed-fvp-mps2-m4
         ${STARTUP_FILE}
 )
 
-target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2 mbed-arm-fm)
+target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2)
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/TARGET_FVP_MPS2_M7/CMakelists.txt
@@ -29,4 +29,4 @@ target_sources(mbed-fvp-mps2-m7
         ${STARTUP_FILE}
 )
 
-target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2 mbed-arm-fm)
+target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2020 ARM Limited. All rights reserved.`
	`1`	`+# Copyright (c) 2021 ARM Limited. All rights reserved.`
`2`	`2`	`# SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`add_library(mbed-fvp-mps2-m0 INTERFACE)`
`@@ -24,4 +24,4 @@ target_sources(mbed-fvp-mps2-m0`
`24`	`24`	`${STARTUP_FILE}`
`25`	`25`	`)`
`26`	`26`
`27`		`-target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2 mbed-arm-fm)`
	`27`	`+target_link_libraries(mbed-fvp-mps2-m0 INTERFACE mbed-fvp-mps2)`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@ target_sources(mbed-fvp-mps2-m4`
`28`	`28`	`${STARTUP_FILE}`
`29`	`29`	`)`
`30`	`30`
`31`		`-target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2 mbed-arm-fm)`
	`31`	`+target_link_libraries(mbed-fvp-mps2-m4 INTERFACE mbed-fvp-mps2)`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,4 @@ target_sources(mbed-fvp-mps2-m7`
`29`	`29`	`${STARTUP_FILE}`
`30`	`30`	`)`
`31`	`31`
`32`		`-target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2 mbed-arm-fm)`
	`32`	`+target_link_libraries(mbed-fvp-mps2-m7 INTERFACE mbed-fvp-mps2)`