Skip to content

Commit 5e2f569

Browse files
committed
chore(cmake): update after rebase
Signed-off-by: Frederic Pillon <[email protected]>
1 parent ddbd192 commit 5e2f569

File tree

8 files changed

+1041
-8
lines changed

8 files changed

+1041
-8
lines changed

Diff for: cmake/boards_db.cmake

+943-8
Large diffs are not rendered by default.

Diff for: variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL
2424
PeripheralPins_DISCO_F413ZH.c
2525
variant_DISCO_F413ZH.cpp
2626
variant_generic.cpp
27+
variant_NUCLEO_F413ZH.cpp
2728
)
2829
target_link_libraries(variant_bin PUBLIC variant_usage)
2930

Diff for: variants/STM32F7xx/F722Z(C-E)T_F732ZET/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL
2222
generic_clock.c
2323
PeripheralPins.c
2424
variant_generic.cpp
25+
variant_NUCLEO_F722ZE.cpp
2526
)
2627
target_link_libraries(variant_bin PUBLIC variant_usage)
2728

Diff for: variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL
2222
generic_clock.c
2323
PeripheralPins.c
2424
variant_generic.cpp
25+
variant_NUCLEO_H723ZG.cpp
2526
)
2627
target_link_libraries(variant_bin PUBLIC variant_usage)
2728

Diff for: variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ target_link_libraries(variant INTERFACE variant_usage)
2121
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
2222
generic_clock.c
2323
PeripheralPins.c
24+
PeripheralPins_LEAFONY_AP03.c
2425
variant_generic.cpp
26+
variant_LEAFONY_AP03.cpp
2527
variant_NUCLEO_L452RE.cpp
2628
)
2729
target_link_libraries(variant_bin PUBLIC variant_usage)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+
+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+

Diff for: variants/STM32WLxx/WL5MOCH/CMakeLists.txt

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+

0 commit comments

Comments
 (0)