Skip to content

Commit

Permalink
vendor: Use incbin from Conan Center
Browse files Browse the repository at this point in the history
This also changes the version to use the format "cci.YYYYMMDD"
  • Loading branch information
cassava committed Feb 7, 2023
1 parent df6994c commit 1dd42fc
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 115 deletions.
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def cloe_requires(dep):
self.requires("fmt/[~=8.1.1]", override=True)
self.requires("inja/[~=3.3.0]", override=True)
self.requires("nlohmann_json/[~=3.10.5]", override=True)
self.requires("incbin/[~=0.88.0]@cloe/stable", override=True),
self.requires("incbin/cci.20211107", override=True),
self.requires(f"boost/{boost_version}", override=True)

def _configure_cmake(self):
Expand Down
2 changes: 1 addition & 1 deletion optional/vtd/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def requirements(self):
self.requires("fmt/[~=8.1.1]", override=True)
self.requires("inja/[~=3.3.0]", override=True)
self.requires("nlohmann_json/[~=3.10.5]", override=True)
self.requires("incbin/[~=0.88.0]@cloe/stable", override=True),
self.requires("incbin/cci.20211107", override=True),

def build_requirements(self):
if self.options.test:
Expand Down
2 changes: 1 addition & 1 deletion runtime/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class CloeRuntime(ConanFile):
"boost/[>=1.65.1]",
"inja/[~=3.3.0]",
"spdlog/[~=1.9.0]",
"incbin/[~=0.88.0]@cloe/stable",
]

_cmake = None
Expand All @@ -49,6 +48,7 @@ def set_version(self):

def requirements(self):
self.requires(f"fable/{self.version}@cloe/develop")
self.requires("incbin/cci.20211107")

def build_requirements(self):
if self.options.test:
Expand Down
1 change: 0 additions & 1 deletion vendor/incbin/.gitignore

This file was deleted.

42 changes: 0 additions & 42 deletions vendor/incbin/CMakeLists.txt

This file was deleted.

6 changes: 0 additions & 6 deletions vendor/incbin/Makefile

This file was deleted.

63 changes: 0 additions & 63 deletions vendor/incbin/conanfile.py

This file was deleted.

0 comments on commit 1dd42fc

Please sign in to comment.