Skip to content

Commit 778bfb5

Browse files
fpistmfpistm
committed
chore: update cmake after variants update
Signed-off-by: Frederic Pillon <[email protected]>
1 parent fe7fb43 commit 778bfb5

File tree

19 files changed

+579
-15
lines changed

19 files changed

+579
-15
lines changed

Diff for: ‎cmake/boards_db.cmake

+15-15
Original file line numberDiff line numberDiff line change
@@ -4251,7 +4251,7 @@ target_compile_options(CYGNET_xusb_HSFS INTERFACE
42514251
# DAISY_PATCH_SM
42524252
# -----------------------------------------------------------------------------
42534253

4254-
set(DAISY_PATCH_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
4254+
set(DAISY_PATCH_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
42554255
set(DAISY_PATCH_SM_MAXSIZE 131072)
42564256
set(DAISY_PATCH_SM_MAXDATASIZE 524288)
42574257
set(DAISY_PATCH_SM_MCU cortex-m7)
@@ -4333,7 +4333,7 @@ target_compile_options(DAISY_PATCH_SM_xusb_HSFS INTERFACE
43334333
# DAISY_PETAL_SM
43344334
# -----------------------------------------------------------------------------
43354335

4336-
set(DAISY_PETAL_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
4336+
set(DAISY_PETAL_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
43374337
set(DAISY_PETAL_SM_MAXSIZE 131072)
43384338
set(DAISY_PETAL_SM_MAXDATASIZE 524288)
43394339
set(DAISY_PETAL_SM_MCU cortex-m7)
@@ -4415,7 +4415,7 @@ target_compile_options(DAISY_PETAL_SM_xusb_HSFS INTERFACE
44154415
# DAISY_SEED
44164416
# -----------------------------------------------------------------------------
44174417

4418-
set(DAISY_SEED_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
4418+
set(DAISY_SEED_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
44194419
set(DAISY_SEED_MAXSIZE 131072)
44204420
set(DAISY_SEED_MAXDATASIZE 524288)
44214421
set(DAISY_SEED_MCU cortex-m7)
@@ -75657,7 +75657,7 @@ target_compile_options(GENERIC_H733ZGTX_xusb_HSFS INTERFACE
7565775657
# GENERIC_H742IGKX
7565875658
# -----------------------------------------------------------------------------
7565975659

75660-
set(GENERIC_H742IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
75660+
set(GENERIC_H742IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7566175661
set(GENERIC_H742IGKX_MAXSIZE 1048576)
7566275662
set(GENERIC_H742IGKX_MAXDATASIZE 524288)
7566375663
set(GENERIC_H742IGKX_MCU cortex-m7)
@@ -75739,7 +75739,7 @@ target_compile_options(GENERIC_H742IGKX_xusb_HSFS INTERFACE
7573975739
# GENERIC_H742IGTX
7574075740
# -----------------------------------------------------------------------------
7574175741

75742-
set(GENERIC_H742IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
75742+
set(GENERIC_H742IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7574375743
set(GENERIC_H742IGTX_MAXSIZE 1048576)
7574475744
set(GENERIC_H742IGTX_MAXDATASIZE 524288)
7574575745
set(GENERIC_H742IGTX_MCU cortex-m7)
@@ -75821,7 +75821,7 @@ target_compile_options(GENERIC_H742IGTX_xusb_HSFS INTERFACE
7582175821
# GENERIC_H742IIKX
7582275822
# -----------------------------------------------------------------------------
7582375823

75824-
set(GENERIC_H742IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
75824+
set(GENERIC_H742IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7582575825
set(GENERIC_H742IIKX_MAXSIZE 2097152)
7582675826
set(GENERIC_H742IIKX_MAXDATASIZE 524288)
7582775827
set(GENERIC_H742IIKX_MCU cortex-m7)
@@ -75903,7 +75903,7 @@ target_compile_options(GENERIC_H742IIKX_xusb_HSFS INTERFACE
7590375903
# GENERIC_H742IITX
7590475904
# -----------------------------------------------------------------------------
7590575905

75906-
set(GENERIC_H742IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
75906+
set(GENERIC_H742IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7590775907
set(GENERIC_H742IITX_MAXSIZE 2097152)
7590875908
set(GENERIC_H742IITX_MAXDATASIZE 524288)
7590975909
set(GENERIC_H742IITX_MCU cortex-m7)
@@ -76641,7 +76641,7 @@ target_compile_options(GENERIC_H742ZITX_xusb_HSFS INTERFACE
7664176641
# GENERIC_H743IGKX
7664276642
# -----------------------------------------------------------------------------
7664376643

76644-
set(GENERIC_H743IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
76644+
set(GENERIC_H743IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7664576645
set(GENERIC_H743IGKX_MAXSIZE 1048576)
7664676646
set(GENERIC_H743IGKX_MAXDATASIZE 524288)
7664776647
set(GENERIC_H743IGKX_MCU cortex-m7)
@@ -76723,7 +76723,7 @@ target_compile_options(GENERIC_H743IGKX_xusb_HSFS INTERFACE
7672376723
# GENERIC_H743IGTX
7672476724
# -----------------------------------------------------------------------------
7672576725

76726-
set(GENERIC_H743IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
76726+
set(GENERIC_H743IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7672776727
set(GENERIC_H743IGTX_MAXSIZE 1048576)
7672876728
set(GENERIC_H743IGTX_MAXDATASIZE 524288)
7672976729
set(GENERIC_H743IGTX_MCU cortex-m7)
@@ -76805,7 +76805,7 @@ target_compile_options(GENERIC_H743IGTX_xusb_HSFS INTERFACE
7680576805
# GENERIC_H743IIKX
7680676806
# -----------------------------------------------------------------------------
7680776807

76808-
set(GENERIC_H743IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
76808+
set(GENERIC_H743IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7680976809
set(GENERIC_H743IIKX_MAXSIZE 2097152)
7681076810
set(GENERIC_H743IIKX_MAXDATASIZE 524288)
7681176811
set(GENERIC_H743IIKX_MCU cortex-m7)
@@ -76887,7 +76887,7 @@ target_compile_options(GENERIC_H743IIKX_xusb_HSFS INTERFACE
7688776887
# GENERIC_H743IITX
7688876888
# -----------------------------------------------------------------------------
7688976889

76890-
set(GENERIC_H743IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
76890+
set(GENERIC_H743IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7689176891
set(GENERIC_H743IITX_MAXSIZE 2097152)
7689276892
set(GENERIC_H743IITX_MAXDATASIZE 524288)
7689376893
set(GENERIC_H743IITX_MCU cortex-m7)
@@ -78281,7 +78281,7 @@ target_compile_options(GENERIC_H747XIHX_xusb_HSFS INTERFACE
7828178281
# GENERIC_H750IBKX
7828278282
# -----------------------------------------------------------------------------
7828378283

78284-
set(GENERIC_H750IBKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
78284+
set(GENERIC_H750IBKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7828578285
set(GENERIC_H750IBKX_MAXSIZE 131072)
7828678286
set(GENERIC_H750IBKX_MAXDATASIZE 524288)
7828778287
set(GENERIC_H750IBKX_MCU cortex-m7)
@@ -78363,7 +78363,7 @@ target_compile_options(GENERIC_H750IBKX_xusb_HSFS INTERFACE
7836378363
# GENERIC_H750IBTX
7836478364
# -----------------------------------------------------------------------------
7836578365

78366-
set(GENERIC_H750IBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
78366+
set(GENERIC_H750IBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7836778367
set(GENERIC_H750IBTX_MAXSIZE 131072)
7836878368
set(GENERIC_H750IBTX_MAXDATASIZE 524288)
7836978369
set(GENERIC_H750IBTX_MCU cortex-m7)
@@ -78691,7 +78691,7 @@ target_compile_options(GENERIC_H750ZBTX_xusb_HSFS INTERFACE
7869178691
# GENERIC_H753IIKX
7869278692
# -----------------------------------------------------------------------------
7869378693

78694-
set(GENERIC_H753IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
78694+
set(GENERIC_H753IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7869578695
set(GENERIC_H753IIKX_MAXSIZE 2097152)
7869678696
set(GENERIC_H753IIKX_MAXDATASIZE 524288)
7869778697
set(GENERIC_H753IIKX_MCU cortex-m7)
@@ -78773,7 +78773,7 @@ target_compile_options(GENERIC_H753IIKX_xusb_HSFS INTERFACE
7877378773
# GENERIC_H753IITX
7877478774
# -----------------------------------------------------------------------------
7877578775

78776-
set(GENERIC_H753IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
78776+
set(GENERIC_H753IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)")
7877778777
set(GENERIC_H753IITX_MAXSIZE 2097152)
7877878778
set(GENERIC_H753IITX_MAXDATASIZE 524288)
7877978779
set(GENERIC_H753IITX_MCU cortex-m7)

Diff for: ‎variants/STM32G4xx/G411CCT/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+

Diff for: ‎variants/STM32G4xx/G411CCU/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+

Diff for: ‎variants/STM32G4xx/G411MCT/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+

Diff for: ‎variants/STM32G4xx/G411RCT/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+

Diff for: ‎variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/CMakeLists.txt

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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+
PeripheralPins_DAISY_PATCH_SM.c
25+
PeripheralPins_DAISY_PETAL_SM.c
26+
PeripheralPins_DAISY_SEED.c
27+
variant_DAISY_PATCH_SM.cpp
28+
variant_DAISY_PETAL_SM.cpp
29+
variant_DAISY_SEED.cpp
30+
variant_generic.cpp
31+
)
32+
target_link_libraries(variant_bin PUBLIC variant_usage)
33+
34+
target_link_libraries(variant INTERFACE
35+
variant_bin
36+
)
37+

Diff for: ‎variants/STM32U5xx/U5F7V(I-J)T/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+

Diff for: ‎variants/STM32U5xx/U5F7V(I-J)TxQ/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+

Diff for: ‎variants/STM32U5xx/U5F9NJHxQ/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)