chore(cmake): update after rebase

fpistm · fpistm · commit aef2ac3657a1 · 2022-12-20T14:52:48.000+01:00
Signed-off-by: Frederic Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/cmake/boards_db.cmake b/cmake/boards_db.cmake
diff --git a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/CMakeLists.txt b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/CMakeLists.txt
@@ -24,6 +24,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL
   PeripheralPins_DISCO_F413ZH.c
   variant_DISCO_F413ZH.cpp
   variant_generic.cpp
+  variant_NUCLEO_F413ZH.cpp
 )
 target_link_libraries(variant_bin PUBLIC variant_usage)
 
diff --git a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/CMakeLists.txt b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/CMakeLists.txt
@@ -22,6 +22,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL
   generic_clock.c
   PeripheralPins.c
   variant_generic.cpp
+  variant_NUCLEO_F722ZE.cpp
 )
 target_link_libraries(variant_bin PUBLIC variant_usage)
 
diff --git a/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/CMakeLists.txt b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/CMakeLists.txt
@@ -22,6 +22,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL
   generic_clock.c
   PeripheralPins.c
   variant_generic.cpp
+  variant_NUCLEO_H723ZG.cpp
 )
 target_link_libraries(variant_bin PUBLIC variant_usage)
 
diff --git a/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/CMakeLists.txt b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/CMakeLists.txt
@@ -21,7 +21,9 @@ target_link_libraries(variant INTERFACE variant_usage)
 add_library(variant_bin STATIC EXCLUDE_FROM_ALL
   generic_clock.c
   PeripheralPins.c
+  PeripheralPins_LEAFONY_AP03.c
   variant_generic.cpp
+  variant_LEAFONY_AP03.cpp
   variant_NUCLEO_L452RE.cpp
 )
 target_link_libraries(variant_bin PUBLIC variant_usage)
diff --git a/variants/STM32L4xx/L496QEI_L496QGIx(S)_L4A6QGI/CMakeLists.txt b/variants/STM32L4xx/L496QEI_L496QGIx(S)_L4A6QGI/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/STM32L4xx/L496QGIxP_L4A6QGIxP/CMakeLists.txt b/variants/STM32L4xx/L496QGIxP_L4A6QGIxP/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/STM32WLxx/WL5MOCH/CMakeLists.txt b/variants/STM32WLxx/WL5MOCH/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
+)
+

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL`
`24`	`24`	`PeripheralPins_DISCO_F413ZH.c`
`25`	`25`	`variant_DISCO_F413ZH.cpp`
`26`	`26`	`variant_generic.cpp`
	`27`	`+ variant_NUCLEO_F413ZH.cpp`
`27`	`28`	`)`
`28`	`29`	`target_link_libraries(variant_bin PUBLIC variant_usage)`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL`
`22`	`22`	`generic_clock.c`
`23`	`23`	`PeripheralPins.c`
`24`	`24`	`variant_generic.cpp`
	`25`	`+ variant_NUCLEO_F722ZE.cpp`
`25`	`26`	`)`
`26`	`27`	`target_link_libraries(variant_bin PUBLIC variant_usage)`
`27`	`28`