From 3d1d3b76bbd30fd8a661f674c0ff7c31ffa0b95f Mon Sep 17 00:00:00 2001
From: jeromecoutant <jerome.coutant@st.com>
Date: Tue, 16 Feb 2021 17:29:33 +0100
Subject: [PATCH] STM32F4: align CMakeLists.txt for all families

---
 .../STM32Cube_FW/CMSIS/CMakeLists.txt         |   7 --
 .../STM32Cube_FW/CMakeLists.txt               |  98 +++++++++++++++-
 .../STM32F4xx_HAL_Driver/CMakeLists.txt       | 106 ------------------
 .../Legacy/CMakeLists.txt                     |  14 ---
 4 files changed, 93 insertions(+), 132 deletions(-)
 delete mode 100644 targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/CMakeLists.txt
 delete mode 100644 targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/CMakeLists.txt
 delete mode 100644 targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/Legacy/CMakeLists.txt

diff --git a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/CMakeLists.txt
deleted file mode 100644
index 5c029ccc7a..0000000000
--- a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-target_include_directories(mbed-core
-    INTERFACE
-        .
-)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMakeLists.txt
index 8a94b4e9e3..506bdf489d 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMakeLists.txt
+++ b/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMakeLists.txt
@@ -1,19 +1,107 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(STM32F4xx_HAL_Driver EXCLUDE_FROM_ALL)
-
 add_library(mbed-stm32f4cube-fw INTERFACE)
 
 target_sources(mbed-stm32f4cube-fw
     INTERFACE
+        STM32F4xx_HAL_Driver/Legacy/stm32f4xx_hal_can_legacy.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_adc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_adc_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_can.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_cec.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_cortex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_crc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_cryp.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_cryp_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dac.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dac_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dcmi.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dcmi_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dfsdm.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dma.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dma2d.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dma_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_dsi.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_eth.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_exti.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_flash.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_flash_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_flash_ramfunc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_fmpi2c.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_fmpi2c_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_fmpsmbus.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_gpio.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_hash.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_hash_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_hcd.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_i2c.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_i2c_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_i2s.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_i2s_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_irda.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_iwdg.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_lptim.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_ltdc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_ltdc_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_mmc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_nand.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_nor.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_pccard.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_pcd.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_pcd_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_pwr.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_pwr_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_qspi.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_rcc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_rcc_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_rng.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_rtc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_rtc_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_sai.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_sai_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_sd.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_sdram.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_smartcard.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_smbus.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_spdifrx.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_spi.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_sram.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_tim.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_tim_ex.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_uart.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_usart.c
+        STM32F4xx_HAL_Driver/stm32f4xx_hal_wwdg.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_adc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_crc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_dac.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_dma.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_dma2d.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_exti.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_fmc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_fmpi2c.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_fsmc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_gpio.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_i2c.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_lptim.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_pwr.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_rcc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_rng.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_rtc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_sdmmc.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_spi.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_tim.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_usart.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_usb.c
+        STM32F4xx_HAL_Driver/stm32f4xx_ll_utils.c
         system_stm32f4xx.c
 )
 
 target_include_directories(mbed-stm32f4cube-fw
     INTERFACE
         .
-        ./CMSIS
+        CMSIS
+        STM32F4xx_HAL_Driver
+        STM32F4xx_HAL_Driver/Legacy
 )
-
-target_link_libraries(mbed-stm32f4cube-fw INTERFACE mbed-stm32f4xx-hal-driver)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/CMakeLists.txt
deleted file mode 100644
index d6e8fccb4a..0000000000
--- a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/CMakeLists.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(Legacy EXCLUDE_FROM_ALL)
-
-add_library(mbed-stm32f4xx-hal-driver INTERFACE)
-
-target_sources(mbed-stm32f4xx-hal-driver
-    INTERFACE
-        stm32f4xx_hal.c
-        stm32f4xx_hal_adc.c
-        stm32f4xx_hal_adc_ex.c
-        stm32f4xx_hal_can.c
-        stm32f4xx_hal_cec.c
-        stm32f4xx_hal_cortex.c
-        stm32f4xx_hal_crc.c
-        stm32f4xx_hal_cryp.c
-        stm32f4xx_hal_cryp_ex.c
-        stm32f4xx_hal_dac.c
-        stm32f4xx_hal_dac_ex.c
-        stm32f4xx_hal_dcmi.c
-        stm32f4xx_hal_dcmi_ex.c
-        stm32f4xx_hal_dfsdm.c
-        stm32f4xx_hal_dma.c
-        stm32f4xx_hal_dma2d.c
-        stm32f4xx_hal_dma_ex.c
-        stm32f4xx_hal_dsi.c
-        stm32f4xx_hal_eth.c
-        stm32f4xx_hal_exti.c
-        stm32f4xx_hal_flash.c
-        stm32f4xx_hal_flash_ex.c
-        stm32f4xx_hal_flash_ramfunc.c
-        stm32f4xx_hal_fmpi2c.c
-        stm32f4xx_hal_fmpi2c_ex.c
-        stm32f4xx_hal_fmpsmbus.c
-        stm32f4xx_hal_gpio.c
-        stm32f4xx_hal_hash.c
-        stm32f4xx_hal_hash_ex.c
-        stm32f4xx_hal_hcd.c
-        stm32f4xx_hal_i2c.c
-        stm32f4xx_hal_i2c_ex.c
-        stm32f4xx_hal_i2s.c
-        stm32f4xx_hal_i2s_ex.c
-        stm32f4xx_hal_irda.c
-        stm32f4xx_hal_iwdg.c
-        stm32f4xx_hal_lptim.c
-        stm32f4xx_hal_ltdc.c
-        stm32f4xx_hal_ltdc_ex.c
-        stm32f4xx_hal_mmc.c
-        stm32f4xx_hal_nand.c
-        stm32f4xx_hal_nor.c
-        stm32f4xx_hal_pccard.c
-        stm32f4xx_hal_pcd.c
-        stm32f4xx_hal_pcd_ex.c
-        stm32f4xx_hal_pwr.c
-        stm32f4xx_hal_pwr_ex.c
-        stm32f4xx_hal_qspi.c
-        stm32f4xx_hal_rcc.c
-        stm32f4xx_hal_rcc_ex.c
-        stm32f4xx_hal_rng.c
-        stm32f4xx_hal_rtc.c
-        stm32f4xx_hal_rtc_ex.c
-        stm32f4xx_hal_sai.c
-        stm32f4xx_hal_sai_ex.c
-        stm32f4xx_hal_sd.c
-        stm32f4xx_hal_sdram.c
-        stm32f4xx_hal_smartcard.c
-        stm32f4xx_hal_smbus.c
-        stm32f4xx_hal_spdifrx.c
-        stm32f4xx_hal_spi.c
-        stm32f4xx_hal_sram.c
-        stm32f4xx_hal_tim.c
-        stm32f4xx_hal_tim_ex.c
-        stm32f4xx_hal_uart.c
-        stm32f4xx_hal_usart.c
-        stm32f4xx_hal_wwdg.c
-        stm32f4xx_ll_adc.c
-        stm32f4xx_ll_crc.c
-        stm32f4xx_ll_dac.c
-        stm32f4xx_ll_dma.c
-        stm32f4xx_ll_dma2d.c
-        stm32f4xx_ll_exti.c
-        stm32f4xx_ll_fmc.c
-        stm32f4xx_ll_fmpi2c.c
-        stm32f4xx_ll_fsmc.c
-        stm32f4xx_ll_gpio.c
-        stm32f4xx_ll_i2c.c
-        stm32f4xx_ll_lptim.c
-        stm32f4xx_ll_pwr.c
-        stm32f4xx_ll_rcc.c
-        stm32f4xx_ll_rng.c
-        stm32f4xx_ll_rtc.c
-        stm32f4xx_ll_sdmmc.c
-        stm32f4xx_ll_spi.c
-        stm32f4xx_ll_tim.c
-        stm32f4xx_ll_usart.c
-        stm32f4xx_ll_usb.c
-        stm32f4xx_ll_utils.c
-)
-
-target_include_directories(mbed-stm32f4xx-hal-driver
-    INTERFACE
-        .
-)
-
-target_link_libraries(mbed-stm32f4xx-hal-driver INTERFACE mbed-stm32f4xx-legacy-hal)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/Legacy/CMakeLists.txt b/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/Legacy/CMakeLists.txt
deleted file mode 100644
index b185120aeb..0000000000
--- a/targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/Legacy/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_library(mbed-stm32f4xx-legacy-hal INTERFACE)
-
-target_sources(mbed-stm32f4xx-legacy-hal
-    INTERFACE
-        stm32f4xx_hal_can_legacy.c
-)
-
-target_include_directories(mbed-stm32f4xx-legacy-hal
-    INTERFACE
-        .
-)