Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb4b91b4

Browse files
committed
chore(cmake): update after h7 variants update
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent9a5bdae commitb4b91b4

File tree

3 files changed

+83
-15
lines changed

3 files changed

+83
-15
lines changed

‎cmake/boards_db.cmake

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4169,7 +4169,7 @@ target_link_options(CoreBoard_F401RC_hid INTERFACE
41694169
# DAISY_PATCH_SM
41704170
# -----------------------------------------------------------------------------
41714171

4172-
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)")
4172+
set(DAISY_PATCH_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
41734173
set(DAISY_PATCH_SM_MAXSIZE 131072)
41744174
set(DAISY_PATCH_SM_MAXDATASIZE 524288)
41754175
set(DAISY_PATCH_SM_MCU cortex-m7)
@@ -4251,7 +4251,7 @@ target_compile_options(DAISY_PATCH_SM_xusb_HSFS INTERFACE
42514251
# DAISY_PETAL_SM
42524252
# -----------------------------------------------------------------------------
42534253

4254-
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)")
4254+
set(DAISY_PETAL_SM_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
42554255
set(DAISY_PETAL_SM_MAXSIZE 131072)
42564256
set(DAISY_PETAL_SM_MAXDATASIZE 524288)
42574257
set(DAISY_PETAL_SM_MCU cortex-m7)
@@ -4333,7 +4333,7 @@ target_compile_options(DAISY_PETAL_SM_xusb_HSFS INTERFACE
43334333
# DAISY_SEED
43344334
# -----------------------------------------------------------------------------
43354335

4336-
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)")
4336+
set(DAISY_SEED_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
43374337
set(DAISY_SEED_MAXSIZE 131072)
43384338
set(DAISY_SEED_MAXDATASIZE 524288)
43394339
set(DAISY_SEED_MCU cortex-m7)
@@ -73425,7 +73425,7 @@ target_compile_options(GENERIC_H733ZGTX_xusb_HSFS INTERFACE
7342573425
# GENERIC_H742IGKX
7342673426
# -----------------------------------------------------------------------------
7342773427

73428-
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)")
73428+
set(GENERIC_H742IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
7342973429
set(GENERIC_H742IGKX_MAXSIZE 1048576)
7343073430
set(GENERIC_H742IGKX_MAXDATASIZE 524288)
7343173431
set(GENERIC_H742IGKX_MCU cortex-m7)
@@ -73507,7 +73507,7 @@ target_compile_options(GENERIC_H742IGKX_xusb_HSFS INTERFACE
7350773507
# GENERIC_H742IGTX
7350873508
# -----------------------------------------------------------------------------
7350973509

73510-
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)")
73510+
set(GENERIC_H742IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
7351173511
set(GENERIC_H742IGTX_MAXSIZE 1048576)
7351273512
set(GENERIC_H742IGTX_MAXDATASIZE 524288)
7351373513
set(GENERIC_H742IGTX_MCU cortex-m7)
@@ -73589,7 +73589,7 @@ target_compile_options(GENERIC_H742IGTX_xusb_HSFS INTERFACE
7358973589
# GENERIC_H742IIKX
7359073590
# -----------------------------------------------------------------------------
7359173591

73592-
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)")
73592+
set(GENERIC_H742IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
7359373593
set(GENERIC_H742IIKX_MAXSIZE 2097152)
7359473594
set(GENERIC_H742IIKX_MAXDATASIZE 524288)
7359573595
set(GENERIC_H742IIKX_MCU cortex-m7)
@@ -73671,7 +73671,7 @@ target_compile_options(GENERIC_H742IIKX_xusb_HSFS INTERFACE
7367173671
# GENERIC_H742IITX
7367273672
# -----------------------------------------------------------------------------
7367373673

73674-
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)")
73674+
set(GENERIC_H742IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
7367573675
set(GENERIC_H742IITX_MAXSIZE 2097152)
7367673676
set(GENERIC_H742IITX_MAXDATASIZE 524288)
7367773677
set(GENERIC_H742IITX_MCU cortex-m7)
@@ -74409,7 +74409,7 @@ target_compile_options(GENERIC_H742ZITX_xusb_HSFS INTERFACE
7440974409
# GENERIC_H743IGKX
7441074410
# -----------------------------------------------------------------------------
7441174411

74412-
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)")
74412+
set(GENERIC_H743IGKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
7441374413
set(GENERIC_H743IGKX_MAXSIZE 1048576)
7441474414
set(GENERIC_H743IGKX_MAXDATASIZE 524288)
7441574415
set(GENERIC_H743IGKX_MCU cortex-m7)
@@ -74491,7 +74491,7 @@ target_compile_options(GENERIC_H743IGKX_xusb_HSFS INTERFACE
7449174491
# GENERIC_H743IGTX
7449274492
# -----------------------------------------------------------------------------
7449374493

74494-
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)")
74494+
set(GENERIC_H743IGTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
7449574495
set(GENERIC_H743IGTX_MAXSIZE 1048576)
7449674496
set(GENERIC_H743IGTX_MAXDATASIZE 524288)
7449774497
set(GENERIC_H743IGTX_MCU cortex-m7)
@@ -74573,7 +74573,7 @@ target_compile_options(GENERIC_H743IGTX_xusb_HSFS INTERFACE
7457374573
# GENERIC_H743IIKX
7457474574
# -----------------------------------------------------------------------------
7457574575

74576-
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)")
74576+
set(GENERIC_H743IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
7457774577
set(GENERIC_H743IIKX_MAXSIZE 2097152)
7457874578
set(GENERIC_H743IIKX_MAXDATASIZE 524288)
7457974579
set(GENERIC_H743IIKX_MCU cortex-m7)
@@ -74655,7 +74655,7 @@ target_compile_options(GENERIC_H743IIKX_xusb_HSFS INTERFACE
7465574655
# GENERIC_H743IITX
7465674656
# -----------------------------------------------------------------------------
7465774657

74658-
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)")
74658+
set(GENERIC_H743IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
7465974659
set(GENERIC_H743IITX_MAXSIZE 2097152)
7466074660
set(GENERIC_H743IITX_MAXDATASIZE 524288)
7466174661
set(GENERIC_H743IITX_MCU cortex-m7)
@@ -76049,7 +76049,7 @@ target_compile_options(GENERIC_H747XIHX_xusb_HSFS INTERFACE
7604976049
# GENERIC_H750IBKX
7605076050
# -----------------------------------------------------------------------------
7605176051

76052-
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)")
76052+
set(GENERIC_H750IBKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
7605376053
set(GENERIC_H750IBKX_MAXSIZE 131072)
7605476054
set(GENERIC_H750IBKX_MAXDATASIZE 524288)
7605576055
set(GENERIC_H750IBKX_MCU cortex-m7)
@@ -76131,7 +76131,7 @@ target_compile_options(GENERIC_H750IBKX_xusb_HSFS INTERFACE
7613176131
# GENERIC_H750IBTX
7613276132
# -----------------------------------------------------------------------------
7613376133

76134-
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)")
76134+
set(GENERIC_H750IBTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
7613576135
set(GENERIC_H750IBTX_MAXSIZE 131072)
7613676136
set(GENERIC_H750IBTX_MAXDATASIZE 524288)
7613776137
set(GENERIC_H750IBTX_MCU cortex-m7)
@@ -76459,7 +76459,7 @@ target_compile_options(GENERIC_H750ZBTX_xusb_HSFS INTERFACE
7645976459
# GENERIC_H753IIKX
7646076460
# -----------------------------------------------------------------------------
7646176461

76462-
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)")
76462+
set(GENERIC_H753IIKX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)K_H743I(G-I)K_H750IBK_H753IIK")
7646376463
set(GENERIC_H753IIKX_MAXSIZE 2097152)
7646476464
set(GENERIC_H753IIKX_MAXDATASIZE 524288)
7646576465
set(GENERIC_H753IIKX_MCU cortex-m7)
@@ -76541,7 +76541,7 @@ target_compile_options(GENERIC_H753IIKX_xusb_HSFS INTERFACE
7654176541
# GENERIC_H753IITX
7654276542
# -----------------------------------------------------------------------------
7654376543

76544-
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)")
76544+
set(GENERIC_H753IITX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32H7xx/H742I(G-I)T_H743I(G-I)T_H750IBT_H753IIT")
7654576545
set(GENERIC_H753IITX_MAXSIZE 2097152)
7654676546
set(GENERIC_H753IITX_MAXDATASIZE 524288)
7654776547
set(GENERIC_H753IITX_MCU cortex-m7)
Lines changed: 37 additions & 0 deletions
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(VERSION3.21)
4+
5+
add_library(variantINTERFACE)
6+
add_library(variant_usageINTERFACE)
7+
8+
target_include_directories(variant_usageINTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usageINTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variantINTERFACEvariant_usage)
18+
19+
20+
21+
add_library(variant_binSTATICEXCLUDE_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_binPUBLICvariant_usage)
33+
34+
target_link_libraries(variantINTERFACE
35+
variant_bin
36+
)
37+
Lines changed: 31 additions & 0 deletions
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(VERSION3.21)
4+
5+
add_library(variantINTERFACE)
6+
add_library(variant_usageINTERFACE)
7+
8+
target_include_directories(variant_usageINTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usageINTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variantINTERFACEvariant_usage)
18+
19+
20+
21+
add_library(variant_binSTATICEXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_binPUBLICvariant_usage)
27+
28+
target_link_libraries(variantINTERFACE
29+
variant_bin
30+
)
31+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp