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

Commit

Permalink
🐛 Fix libhal usage after conan upgrade
Browse files Browse the repository at this point in the history
⬆️ Bump version to 2.0.3 to skip CCI version
  • Loading branch information
Khalil Estell authored and kammce committed Nov 27, 2023
1 parent d5245b5 commit 0bc4ddf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ libhal_unit_test(SOURCES
tests/main.test.cpp

PACKAGES
Boost
boost-leaf
tl-function-ref

LINK_LIBRARIES
Boost::headers
boost::leaf
tl::function-ref)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# libhal
# libhal

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

```python
def requirements(self):
self.requires("libhal/[^2.0.0]")
self.requires("libhal/[^2.0.3]", transitive_headers=True)
```

The version number can be changed to whatever is appropriate for your
Expand Down
10 changes: 4 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

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

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

def build_requirements(self):
self.tool_requires("cmake/3.27.1")
self.tool_requires("libhal-cmake-util/3.0.0")
self.tool_requires("libhal-cmake-util/3.0.1")
self.test_requires("boost-ext-ut/1.1.9")

def requirements(self):
self.requires("tl-function-ref/1.0.0")
self.requires("boost/1.83.0", transitive_headers=True,
options={
"header_only": True,
})
self.requires("boost-leaf/1.83.0")

def layout(self):
cmake_layout(self)
Expand Down
2 changes: 1 addition & 1 deletion demos/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class HalTestDemos(ConanFile):
generators = "CMakeToolchain", "CMakeDeps", "VirtualBuildEnv"

def requirements(self):
self.requires("libhal/2.0.0")
self.requires("libhal/2.0.3")

def layout(self):
cmake_layout(self)
Expand Down

0 comments on commit 0bc4ddf

Please sign in to comment.