Merge pull request #14244 from 0xc0170/cmake-refactor-analog-devices

Analog Devices: refactor CMake targets

Author: 0xc0170

targets/TARGET_Analog_Devices/CMakeLists.txt

@@ -1,13 +1,12 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("ADUCM302X" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_ADUCM302X)
-elseif("ADUCM4X50" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_ADUCM4X50)
-endif()
+add_subdirectory(TARGET_ADUCM302X EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_ADUCM4X50 EXCLUDE_FROM_ALL)
 
-target_include_directories(mbed-core
+add_library(mbed-analog-devices INTERFACE)
+
+target_include_directories(mbed-analog-devices
     INTERFACE
         .
 )

targets/TARGET_Analog_Devices/TARGET_ADUCM302X/CMakeLists.txt

@@ -1,6 +1,5 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("ADUCM3029" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_ADUCM3029)
-endif()
+add_subdirectory(TARGET_ADUCM3029 EXCLUDE_FROM_ALL)
+

targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/CMakeLists.txt

@@ -1,30 +1,19 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(TARGET_EV_COG_AD3029LZ EXCLUDE_FROM_ALL)
+
+add_library(mbed-aducm3029 INTERFACE)
+
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE TOOLCHAIN_ARM_STD/ADuCM3029.sct)
 elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(LINKER_FILE TOOLCHAIN_GCC_ARM/ADuCM3029.ld)
 endif()
 
-if ("EV_COG_AD3029LZ" IN_LIST MBED_TARGET_LABELS)
-    target_include_directories(mbed-core
-        INTERFACE
-            TARGET_EV_COG_AD3029LZ
-            TARGET_EV_COG_AD3029LZ/device
-    )
-
-    target_sources(mbed-core
-        INTERFACE
-            TARGET_EV_COG_AD3029LZ/device/system_ADuCM3029.c
-    )
-
-    set(STARTUP_FILE TARGET_EV_COG_AD3029LZ/device/startup_ADuCM3029.c)
-endif()
-
-set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-aducm3029 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_include_directories(mbed-core
+target_include_directories(mbed-aducm3029
     INTERFACE
         api
         bsp
@@ -65,7 +54,7 @@ target_include_directories(mbed-core
         bsp/xint
 )
 
-target_sources(mbed-core
+target_sources(mbed-aducm3029
     INTERFACE
         api/analogin_api.c
         api/flash_api.c
@@ -121,6 +110,6 @@ target_sources(mbed-core
         bsp/wdt/adi_wdt.c
 
         bsp/xint/adi_xint.c
-
-        ${STARTUP_FILE}
 )
+
+target_link_libraries(mbed-aducm3029 INTERFACE mbed-analog-devices)

targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/TARGET_EV_COG_AD3029LZ/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-ev-cog-ad3029lz INTERFACE)
+
+target_include_directories(mbed-ev-cog-ad3029lz
+    INTERFACE
+        .
+        device
+)
+
+target_sources(mbed-ev-cog-ad3029lz
+    INTERFACE
+        device/system_ADuCM3029.c
+        device/startup_ADuCM3029.c
+)
+
+target_link_libraries(mbed-ev-cog-ad3029lz INTERFACE mbed-aducm3029)

targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/CMakeLists.txt

@@ -1,6 +1,4 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if ("ADUCM4050" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_ADUCM4050)
-endif()
+add_subdirectory(TARGET_ADUCM4050 EXCLUDE_FROM_ALL)

targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/CMakeLists.txt

@@ -1,30 +1,19 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(TARGET_EV_COG_AD4050LZ EXCLUDE_FROM_ALL)
+
+add_library(mbed-aducm4050 INTERFACE)
+
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(LINKER_FILE TOOLCHAIN_GCC_ARM/ADuCM4050.ld)
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     set(LINKER_FILE TOOLCHAIN_ARM_STD/ADuCM4050.sct)
 endif()
 
-if("EV_COG_AD4050LZ" IN_LIST MBED_TARGET_LABELS)
-    target_include_directories(mbed-core
-        INTERFACE
-            TARGET_EV_COG_AD4050LZ
-            TARGET_EV_COG_AD4050LZ/device
-        )
-
-    target_sources(mbed-core
-        INTERFACE
-            TARGET_EV_COG_AD4050LZ/device/system_ADuCM4050.c
-    )
-
-    set(STARTUP_FILE TARGET_EV_COG_AD4050LZ/device/startup_ADuCM4050.c)
-endif()
-
-set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+mbed_set_linker_script(mbed-aducm4050 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
 
-target_include_directories(mbed-core
+target_include_directories(mbed-aducm4050
     INTERFACE
         api
         bsp
@@ -65,7 +54,7 @@ target_include_directories(mbed-core
         bsp/xint
 )
 
-target_sources(mbed-core
+target_sources(mbed-aducm4050
     INTERFACE
         api/analogin_api.c
         api/flash_api.c
@@ -121,6 +110,6 @@ target_sources(mbed-core
         bsp/wdt/adi_wdt.c
 
         bsp/xint/adi_xint.c
-
-        ${STARTUP_FILE}
 )
+
+target_link_libraries(mbed-aducm4050 INTERFACE mbed-analog-devices)

targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/TARGET_EV_COG_AD4050LZ/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-ev-cog-ad4050lz INTERFACE)
+
+target_include_directories(mbed-ev-cog-ad4050lz
+    INTERFACE
+        .
+        device
+    )
+
+target_sources(mbed-ev-cog-ad4050lz
+    INTERFACE
+        device/system_ADuCM4050.c
+        device/startup_ADuCM4050.c
+)
+
+target_link_libraries(mbed-ev-cog-ad4050lz INTERFACE mbed-aducm4050)