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

Commitce31fed

Browse files
committed
chore(h5): add cmake support to new variants
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parentf0ea334 commitce31fed

File tree

6 files changed

+158
-3
lines changed

6 files changed

+158
-3
lines changed

‎cmake/boards_db.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102957,13 +102957,13 @@ set(NUCLEO_L496ZG-P_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32L4x
102957102957
set(NUCLEO_L496ZG-P_MAXSIZE 1048576)
102958102958
set(NUCLEO_L496ZG-P_MAXDATASIZE 327680)
102959102959
set(NUCLEO_L496ZG-P_MCU cortex-m4)
102960-
set(NUCLEO_L496ZG-P_FPCONF "fpv4-sp-d16-")
102960+
set(NUCLEO_L496ZG-P_FPCONF "fpv4-sp-d16-hard")
102961102961
add_library(NUCLEO_L496ZG-P INTERFACE)
102962102962
target_compile_options(NUCLEO_L496ZG-P INTERFACE
102963102963
"SHELL:-DSTM32L496xx "
102964102964
"SHELL:"
102965102965
"SHELL:"
102966-
"SHELL:-mfpu=fpv4-sp-d16 "
102966+
"SHELL:-mfpu=fpv4-sp-d16-mfloat-abi=hard"
102967102967
-mcpu=${NUCLEO_L496ZG-P_MCU}
102968102968
)
102969102969
target_compile_definitions(NUCLEO_L496ZG-P INTERFACE
@@ -102987,7 +102987,7 @@ target_link_options(NUCLEO_L496ZG-P INTERFACE
102987102987
"LINKER:--defsym=LD_FLASH_OFFSET=0x0"
102988102988
"LINKER:--defsym=LD_MAX_SIZE=1048576"
102989102989
"LINKER:--defsym=LD_MAX_DATA_SIZE=327680"
102990-
"SHELL:-mfpu=fpv4-sp-d16 "
102990+
"SHELL:-mfpu=fpv4-sp-d16-mfloat-abi=hard"
102991102991
-mcpu=${NUCLEO_L496ZG-P_MCU}
102992102992
)
102993102993

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