chore(cmake): update

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

cmake/boards_db.cmake

@@ -8399,7 +8399,7 @@ target_compile_options(GENERIC_C092RCTX_usb_none INTERFACE
 # GENERIC_C552RCTX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_C552RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)T_C562RET")
+set(GENERIC_C552RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)")
 set(GENERIC_C552RCTX_MAXSIZE 262144)
 set(GENERIC_C552RCTX_MAXDATASIZE 131072)
 set(GENERIC_C552RCTX_MCU cortex-m33)
@@ -8467,7 +8467,7 @@ target_compile_options(GENERIC_C552RCTX_usb_none INTERFACE
 # GENERIC_C552RETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_C552RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)T_C562RET")
+set(GENERIC_C552RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)")
 set(GENERIC_C552RETX_MAXSIZE 524288)
 set(GENERIC_C552RETX_MAXDATASIZE 131072)
 set(GENERIC_C552RETX_MCU cortex-m33)
@@ -8535,7 +8535,7 @@ target_compile_options(GENERIC_C552RETX_usb_none INTERFACE
 # GENERIC_C562RETX
 # -----------------------------------------------------------------------------
 
-set(GENERIC_C562RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)T_C562RET")
+set(GENERIC_C562RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)")
 set(GENERIC_C562RETX_MAXSIZE 524288)
 set(GENERIC_C562RETX_MAXDATASIZE 131072)
 set(GENERIC_C562RETX_MCU cortex-m33)
@@ -106023,7 +106023,7 @@ target_compile_options(NUCLEO_C092RC_xusb_HSFS INTERFACE
 # NUCLEO_C562RE
 # -----------------------------------------------------------------------------
 
-set(NUCLEO_C562RE_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)T_C562RET")
+set(NUCLEO_C562RE_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)")
 set(NUCLEO_C562RE_MAXSIZE 524288)
 set(NUCLEO_C562RE_MAXDATASIZE 131072)
 set(NUCLEO_C562RE_MCU cortex-m33)

variants/STM32C5xx/C551R(C-E)Tx(J)/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
+)
+

variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)/CMakeLists.txt

@@ -0,0 +1,32 @@
+# 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
+  variant_NUCLEO_C562RE.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+