Merge pull request #14428 from 0xc0170/cmake-fix-targets-labels

0xc0170 · web-flow · commit b7f1acff440e · 2021-03-22T10:56:55.000+01:00
CMake targets: remove labels usage, not required anymore
diff --git a/targets/CMakeLists.txt b/targets/CMakeLists.txt
@@ -2,36 +2,19 @@
 # SPDX-License-Identifier: Apache-2.0
 include(../tools/cmake/set_linker_script.cmake)
 
-if("Ambiq_Micro" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_Ambiq_Micro)
-elseif("Analog_Devices" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_Analog_Devices)
-elseif("ARM_FM" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_ARM_FM)
-elseif("ARM_SSG" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_ARM_SSG)
-elseif("Cypress" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_Cypress)
-elseif("Freescale" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_Freescale)
-elseif("GigaDevice" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_GigaDevice)
-elseif("Maxim" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_Maxim)
-elseif("NORDIC" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_NORDIC)
-elseif("NUVOTON" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_NUVOTON)
-elseif("NXP" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_NXP)
-elseif("RENESAS" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_RENESAS)
-elseif("Samsung" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_Samsung)
-elseif("Silicon_Labs" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_Silicon_Labs)
-elseif("STM" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_STM)
-elseif("TOSHIBA" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_TOSHIBA)
-endif()
+add_subdirectory(TARGET_Ambiq_Micro EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_Analog_Devices EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_ARM_FM EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_ARM_SSG EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_Cypress EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_Freescale EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_GigaDevice EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_Maxim EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_NORDIC EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_NUVOTON EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_NXP EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_RENESAS EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_Samsung EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_Silicon_Labs EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_STM EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_TOSHIBA EXCLUDE_FROM_ALL)
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/CMakeLists.txt b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/CMakeLists.txt
@@ -9,14 +9,16 @@ add_subdirectory(TARGET_MCU_K22F EXCLUDE_FROM_ALL)
 add_subdirectory(TARGET_MCU_K64F EXCLUDE_FROM_ALL)
 add_subdirectory(middleware/wireless/TARGET_FRAMEWORK_5_3_3 EXCLUDE_FROM_ALL)
 
-add_library(mbed-mcuxpresso-mcus INTERFACE)
+# We append freescale to the name as this should be unique but NXP/Freescale are in the tree covering
+# same vendor
+add_library(mbed-freescale-mcuxpresso-mcus INTERFACE)
 
-target_include_directories(mbed-mcuxpresso-mcus
+target_include_directories(mbed-freescale-mcuxpresso-mcus
     INTERFACE
         api
 )
 
-target_sources(mbed-mcuxpresso-mcus
+target_sources(mbed-freescale-mcuxpresso-mcus
     INTERFACE
         fsl_common.c
 
@@ -35,4 +37,4 @@ target_sources(mbed-mcuxpresso-mcus
         api/sleep.c
 )
 
-target_link_libraries(mbed-mcuxpresso-mcus INTERFACE mbed-freescale)
+target_link_libraries(mbed-freescale-mcuxpresso-mcus INTERFACE mbed-freescale)
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/CMakeLists.txt b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/CMakeLists.txt
@@ -78,4 +78,4 @@ target_sources(mbed-k66f
 
 mbed_set_linker_script(mbed-k66f ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(mbed-k66f INTERFACE mbed-mcuxpresso-mcus mbed-frdm-k66f)
+target_link_libraries(mbed-k66f INTERFACE mbed-freescale-mcuxpresso-mcus mbed-frdm-k66f)
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/CMakeLists.txt b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/CMakeLists.txt
@@ -92,4 +92,4 @@ target_sources(mbed-k82f
 
 mbed_set_linker_script(mbed-k82f ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(mbed-k82f INTERFACE mbed-mcuxpresso-mcus mbed-frdm-k82f)
+target_link_libraries(mbed-k82f INTERFACE mbed-freescale-mcuxpresso-mcus mbed-frdm-k82f)
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/CMakeLists.txt b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/CMakeLists.txt
@@ -70,7 +70,7 @@ target_sources(mbed-kl43z
         ${STARTUP_FILE}
 )
 
-target_link_libraries(mbed-kl43z INTERFACE mbed-mcuxpresso-mcus)
+target_link_libraries(mbed-kl43z INTERFACE mbed-freescale-mcuxpresso-mcus)
 
 mbed_set_linker_script(mbed-kl43z ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/CMakeLists.txt b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/CMakeLists.txt
@@ -66,4 +66,4 @@ target_sources(mbed-kw41z
 
 mbed_set_linker_script(mbed-kw41z ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_link_libraries(mbed-kw41z INTERFACE mbed-mcuxpresso-mcus mbed-framework-5-3-3 mbed-frdm-kw41z)
+target_link_libraries(mbed-kw41z INTERFACE mbed-freescale-mcuxpresso-mcus mbed-framework-5-3-3 mbed-frdm-kw41z)
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/CMakeLists.txt b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/CMakeLists.txt
@@ -55,4 +55,4 @@ target_sources(mbed-mcu-k22f
         drivers/fsl_wdog.c
 )
 
-target_link_libraries(mbed-mcu-k22f INTERFACE mbed-mcuxpresso-mcus)
+target_link_libraries(mbed-mcu-k22f INTERFACE mbed-freescale-mcuxpresso-mcus)
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/CMakeLists.txt b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/CMakeLists.txt
@@ -75,7 +75,7 @@ target_sources(mbed-mcu-k64f
         ${STARTUP_FILE}
 )
 
-target_link_libraries(mbed-mcu-k64f INTERFACE mbed-mcuxpresso-mcus)
+target_link_libraries(mbed-mcu-k64f INTERFACE mbed-freescale-mcuxpresso-mcus)
 
 mbed_set_linker_script(mbed-mcu-k64f ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 

Original file line number	Diff line number	Diff line change
`@@ -78,4 +78,4 @@ target_sources(mbed-k66f`
`78`	`78`
`79`	`79`	`mbed_set_linker_script(mbed-k66f ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})`
`80`	`80`
`81`		`-target_link_libraries(mbed-k66f INTERFACE mbed-mcuxpresso-mcus mbed-frdm-k66f)`
	`81`	`+target_link_libraries(mbed-k66f INTERFACE mbed-freescale-mcuxpresso-mcus mbed-frdm-k66f)`
Original file line number	Diff line number	Diff line change
`@@ -92,4 +92,4 @@ target_sources(mbed-k82f`
`92`	`92`
`93`	`93`	`mbed_set_linker_script(mbed-k82f ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})`
`94`	`94`
`95`		`-target_link_libraries(mbed-k82f INTERFACE mbed-mcuxpresso-mcus mbed-frdm-k82f)`
	`95`	`+target_link_libraries(mbed-k82f INTERFACE mbed-freescale-mcuxpresso-mcus mbed-frdm-k82f)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ target_sources(mbed-kl43z`
`70`	`70`	`${STARTUP_FILE}`
`71`	`71`	`)`
`72`	`72`
`73`		`-target_link_libraries(mbed-kl43z INTERFACE mbed-mcuxpresso-mcus)`
	`73`	`+target_link_libraries(mbed-kl43z INTERFACE mbed-freescale-mcuxpresso-mcus)`
`74`	`74`
`75`	`75`	`mbed_set_linker_script(mbed-kl43z ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,4 @@ target_sources(mbed-kw41z`
`66`	`66`
`67`	`67`	`mbed_set_linker_script(mbed-kw41z ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})`
`68`	`68`
`69`		`-target_link_libraries(mbed-kw41z INTERFACE mbed-mcuxpresso-mcus mbed-framework-5-3-3 mbed-frdm-kw41z)`
	`69`	`+target_link_libraries(mbed-kw41z INTERFACE mbed-freescale-mcuxpresso-mcus mbed-framework-5-3-3 mbed-frdm-kw41z)`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,4 @@ target_sources(mbed-mcu-k22f`
`55`	`55`	`drivers/fsl_wdog.c`
`56`	`56`	`)`
`57`	`57`
`58`		`-target_link_libraries(mbed-mcu-k22f INTERFACE mbed-mcuxpresso-mcus)`
	`58`	`+target_link_libraries(mbed-mcu-k22f INTERFACE mbed-freescale-mcuxpresso-mcus)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ target_sources(mbed-mcu-k64f`
`75`	`75`	`${STARTUP_FILE}`
`76`	`76`	`)`
`77`	`77`
`78`		`-target_link_libraries(mbed-mcu-k64f INTERFACE mbed-mcuxpresso-mcus)`
	`78`	`+target_link_libraries(mbed-mcu-k64f INTERFACE mbed-freescale-mcuxpresso-mcus)`
`79`	`79`
`80`	`80`	`mbed_set_linker_script(mbed-mcu-k64f ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})`
`81`	`81`