Skip to content

Commit 00972b8

Browse files
authored
✨ Support COMPILE_FLAGS option to demos build (#31)
- ⬆️ 4.2.0
1 parent af8b519 commit 00972b8

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fetch-depth: 0
3535

3636
- name: 📥 Install CMake & Conan
37-
run: pip3 install cmake conan==2.2.2
37+
run: pipx install cmake conan==2.16.1
3838

3939
- name: 📡 Add `libhal` conan remote
4040
run: conan remote add libhal

cmake/build.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ function(libhal_build_demos)
231231
INCLUDES
232232
PACKAGES
233233
LINK_LIBRARIES
234-
LINK_FLAGS)
234+
LINK_FLAGS
235+
COMPILE_FLAGS)
235236
cmake_parse_arguments(DEMO_ARGS
236237
"${options}"
237238
"${one_value_args}"
@@ -277,6 +278,7 @@ function(libhal_build_demos)
277278
-fdata-sections
278279
-flto
279280
-ffat-lto-objects
281+
${DEMO_ARGS_COMPILE_FLAGS}
280282
$<$<COMPILE_LANGUAGE:CXX>:-fexceptions -fno-rtti>
281283
)
282284
target_link_libraries(startup_code PRIVATE
@@ -309,6 +311,7 @@ function(libhal_build_demos)
309311
-fdata-sections
310312
-flto
311313
-ffat-lto-objects
314+
${DEMO_ARGS_COMPILE_FLAGS}
312315
$<$<COMPILE_LANGUAGE:CXX>:-fexceptions -fno-rtti>
313316
)
314317

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
class libhal_cmake_util_conan(ConanFile):
2525
name = "libhal-cmake-util"
26-
version = "4.1.10"
26+
version = "4.2.0"
2727
license = "Apache-2.0"
2828
homepage = "https://libhal.github.io/libhal-armcortex"
2929
description = ("A collection of CMake scripts for ARM Cortex ")

0 commit comments

Comments
 (0)