chore(h5): add cmake support to new variants

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
stm32duino · Apr 8, 2024 · acd4c3a · acd4c3a
1 parent bc1b235
commit acd4c3a
Show file tree

Hide file tree

Showing 6 changed files with 158 additions and 3 deletions.
diff --git a/cmake/boards_db.cmake b/cmake/boards_db.cmake
@@ -102957,13 +102957,13 @@ set(NUCLEO_L496ZG-P_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32L4x
 set(NUCLEO_L496ZG-P_MAXSIZE 1048576)
 set(NUCLEO_L496ZG-P_MAXDATASIZE 327680)
 set(NUCLEO_L496ZG-P_MCU cortex-m4)
-set(NUCLEO_L496ZG-P_FPCONF "fpv4-sp-d16-")
+set(NUCLEO_L496ZG-P_FPCONF "fpv4-sp-d16-hard")
 add_library(NUCLEO_L496ZG-P INTERFACE)
 target_compile_options(NUCLEO_L496ZG-P INTERFACE
   "SHELL:-DSTM32L496xx  "
   "SHELL:"
   "SHELL:"
-  "SHELL:-mfpu=fpv4-sp-d16 "
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
   -mcpu=${NUCLEO_L496ZG-P_MCU}
 )
 target_compile_definitions(NUCLEO_L496ZG-P INTERFACE
@@ -102987,7 +102987,7 @@ target_link_options(NUCLEO_L496ZG-P INTERFACE
   "LINKER:--defsym=LD_FLASH_OFFSET=0x0"
 	"LINKER:--defsym=LD_MAX_SIZE=1048576"
 	"LINKER:--defsym=LD_MAX_DATA_SIZE=327680"
-  "SHELL:-mfpu=fpv4-sp-d16 "
+  "SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
   -mcpu=${NUCLEO_L496ZG-P_MCU}
 )
 

diff --git a/variants/STM32H5xx/H523C(C-E)(T-U)_H533CE(T-U)/CMakeLists.txt b/variants/STM32H5xx/H523C(C-E)(T-U)_H533CE(T-U)/CMakeLists.txt
@@ -0,0 +1,31 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(variant INTERFACE)
+add_library(variant_usage INTERFACE)
+
+target_include_directories(variant_usage INTERFACE
+  .
+)
+
+
+target_link_libraries(variant_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(variant INTERFACE variant_usage)
+
+
+
+add_library(variant_bin STATIC EXCLUDE_FROM_ALL
+  generic_clock.c
+  PeripheralPins.c
+  variant_generic.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+
diff --git a/variants/STM32H5xx/H523HEY_H533HEY/CMakeLists.txt b/variants/STM32H5xx/H523HEY_H533HEY/CMakeLists.txt
@@ -0,0 +1,31 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(variant INTERFACE)
+add_library(variant_usage INTERFACE)
+
+target_include_directories(variant_usage INTERFACE
+  .
+)
+
+
+target_link_libraries(variant_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(variant INTERFACE variant_usage)
+
+
+
+add_library(variant_bin STATIC EXCLUDE_FROM_ALL
+  generic_clock.c
+  PeripheralPins.c
+  variant_generic.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+
diff --git a/variants/STM32H5xx/H523R(C-E)T_H533RET/CMakeLists.txt b/variants/STM32H5xx/H523R(C-E)T_H533RET/CMakeLists.txt
@@ -0,0 +1,31 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(variant INTERFACE)
+add_library(variant_usage INTERFACE)
+
+target_include_directories(variant_usage INTERFACE
+  .
+)
+
+
+target_link_libraries(variant_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(variant INTERFACE variant_usage)
+
+
+
+add_library(variant_bin STATIC EXCLUDE_FROM_ALL
+  generic_clock.c
+  PeripheralPins.c
+  variant_generic.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+
diff --git a/variants/STM32H5xx/H523V(C-E)(I-T)_H533VE(I-T)/CMakeLists.txt b/variants/STM32H5xx/H523V(C-E)(I-T)_H533VE(I-T)/CMakeLists.txt
@@ -0,0 +1,31 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(variant INTERFACE)
+add_library(variant_usage INTERFACE)
+
+target_include_directories(variant_usage INTERFACE
+  .
+)
+
+
+target_link_libraries(variant_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(variant INTERFACE variant_usage)
+
+
+
+add_library(variant_bin STATIC EXCLUDE_FROM_ALL
+  generic_clock.c
+  PeripheralPins.c
+  variant_generic.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+
diff --git a/variants/STM32H5xx/H523Z(C-E)(J-T)_H533ZE(J-T)/CMakeLists.txt b/variants/STM32H5xx/H523Z(C-E)(J-T)_H533ZE(J-T)/CMakeLists.txt
@@ -0,0 +1,31 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(variant INTERFACE)
+add_library(variant_usage INTERFACE)
+
+target_include_directories(variant_usage INTERFACE
+  .
+)
+
+
+target_link_libraries(variant_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(variant INTERFACE variant_usage)
+
+
+
+add_library(variant_bin STATIC EXCLUDE_FROM_ALL
+  generic_clock.c
+  PeripheralPins.c
+  variant_generic.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+