Skip to content
This repository was archived by the owner on Jan 18, 2024. It is now read-only.

Commit 0bc4ddf

Browse files
Khalil Estellkammce
authored andcommitted
🐛 Fix libhal usage after conan upgrade
⬆️ Bump version to 2.0.3 to skip CCI version
1 parent d5245b5 commit 0bc4ddf

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ libhal_unit_test(SOURCES
4747
tests/main.test.cpp
4848

4949
PACKAGES
50-
Boost
50+
boost-leaf
5151
tl-function-ref
5252

5353
LINK_LIBRARIES
54-
Boost::headers
54+
boost::leaf
5555
tl::function-ref)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# libhal
1+
# libhal
22

33
[![✅CI](https://github.com/libhal/libhal/actions/workflows/ci.yml/badge.svg)](https://github.com/libhal/libhal/actions/workflows/ci.yml)
44
[![coverage](https://libhal.github.io/libhal/coverage/coverage.svg)](https://libhal.github.io/libhal/coverage/)
@@ -33,7 +33,7 @@ Add the following to your `requirements()` method to the `ConanFile` class:
3333

3434
```python
3535
def requirements(self):
36-
self.requires("libhal/[^2.0.0]")
36+
self.requires("libhal/[^2.0.3]", transitive_headers=True)
3737
```
3838

3939
The version number can be changed to whatever is appropriate for your

conanfile.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
class libhal_conan(ConanFile):
2828
name = "libhal"
29-
version = "2.0.2"
29+
version = "2.0.3"
3030
license = "Apache-2.0"
3131
url = "https://github.com/conan-io/conan-center-index"
3232
homepage = "https://libhal.github.io/libhal"
@@ -35,6 +35,7 @@ class libhal_conan(ConanFile):
3535
topics = ("peripherals", "hardware", "abstraction", "devices", "hal")
3636
settings = "compiler", "build_type", "os", "arch"
3737
exports_sources = "include/*", "tests/*", "CMakeLists.txt", "LICENSE"
38+
package_type = "header-library"
3839
generators = "CMakeToolchain", "CMakeDeps"
3940
no_copy_source = True
4041

@@ -60,15 +61,12 @@ def validate(self):
6061

6162
def build_requirements(self):
6263
self.tool_requires("cmake/3.27.1")
63-
self.tool_requires("libhal-cmake-util/3.0.0")
64+
self.tool_requires("libhal-cmake-util/3.0.1")
6465
self.test_requires("boost-ext-ut/1.1.9")
6566

6667
def requirements(self):
6768
self.requires("tl-function-ref/1.0.0")
68-
self.requires("boost/1.83.0", transitive_headers=True,
69-
options={
70-
"header_only": True,
71-
})
69+
self.requires("boost-leaf/1.83.0")
7270

7371
def layout(self):
7472
cmake_layout(self)

demos/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class HalTestDemos(ConanFile):
2323
generators = "CMakeToolchain", "CMakeDeps", "VirtualBuildEnv"
2424

2525
def requirements(self):
26-
self.requires("libhal/2.0.0")
26+
self.requires("libhal/2.0.3")
2727

2828
def layout(self):
2929
cmake_layout(self)

0 commit comments

Comments
 (0)