Skip to content

Commit 79c5077

Browse files
fpistmfpistm
committed
chore(cmake): update
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 9930246 commit 79c5077

4 files changed

Lines changed: 69 additions & 4 deletions

File tree

‎cmake/boards_db.cmake‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8399,7 +8399,7 @@ target_compile_options(GENERIC_C092RCTX_usb_none INTERFACE
83998399
# GENERIC_C552RCTX
84008400
# -----------------------------------------------------------------------------
84018401

8402-
set(GENERIC_C552RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)T_C562RET")
8402+
set(GENERIC_C552RCTX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)")
84038403
set(GENERIC_C552RCTX_MAXSIZE 262144)
84048404
set(GENERIC_C552RCTX_MAXDATASIZE 131072)
84058405
set(GENERIC_C552RCTX_MCU cortex-m33)
@@ -8467,7 +8467,7 @@ target_compile_options(GENERIC_C552RCTX_usb_none INTERFACE
84678467
# GENERIC_C552RETX
84688468
# -----------------------------------------------------------------------------
84698469

8470-
set(GENERIC_C552RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)T_C562RET")
8470+
set(GENERIC_C552RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)")
84718471
set(GENERIC_C552RETX_MAXSIZE 524288)
84728472
set(GENERIC_C552RETX_MAXDATASIZE 131072)
84738473
set(GENERIC_C552RETX_MCU cortex-m33)
@@ -8535,7 +8535,7 @@ target_compile_options(GENERIC_C552RETX_usb_none INTERFACE
85358535
# GENERIC_C562RETX
85368536
# -----------------------------------------------------------------------------
85378537

8538-
set(GENERIC_C562RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)T_C562RET")
8538+
set(GENERIC_C562RETX_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)")
85398539
set(GENERIC_C562RETX_MAXSIZE 524288)
85408540
set(GENERIC_C562RETX_MAXDATASIZE 131072)
85418541
set(GENERIC_C562RETX_MCU cortex-m33)
@@ -106023,7 +106023,7 @@ target_compile_options(NUCLEO_C092RC_xusb_HSFS INTERFACE
106023106023
# NUCLEO_C562RE
106024106024
# -----------------------------------------------------------------------------
106025106025

106026-
set(NUCLEO_C562RE_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)T_C562RET")
106026+
set(NUCLEO_C562RE_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32C5xx/C552R(C-E)Tx(J)_C562RETx(J)")
106027106027
set(NUCLEO_C562RE_MAXSIZE 524288)
106028106028
set(NUCLEO_C562RE_MAXDATASIZE 131072)
106029106029
set(NUCLEO_C562RE_MCU cortex-m33)
@@ -107834,6 +107834,7 @@ add_library(NUCLEO_F746ZG INTERFACE)
107834107834
target_compile_options(NUCLEO_F746ZG INTERFACE
107835107835
"SHELL:-DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER"
107836107836
"SHELL:-DSTM32F746xx"
107837+
"SHELL:-DCUSTOM_PERIPHERAL_PINS"
107837107838
"SHELL:-mfpu=fpv5-sp-d16 -mfloat-abi=hard"
107838107839
-mcpu=${NUCLEO_F746ZG_MCU}
107839107840
)

‎variants/STM32C5xx/C551R(C-E)Tx(J)/CMakeLists.txt‎

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(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+

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
variant_NUCLEO_C562RE.cpp
26+
)
27+
target_link_libraries(variant_bin PUBLIC variant_usage)
28+
29+
target_link_libraries(variant INTERFACE
30+
variant_bin
31+
)
32+

‎variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
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
PeripheralPins_ETHERCAT_DUINO.c
25+
PeripheralPins_F7x6ZG.c
2526
variant_ETHERCAT_DUINO.cpp
2627
variant_generic.cpp
2728
variant_NUCLEO_F7x6ZG.cpp

0 commit comments

Comments
 (0)