diff --git a/conanfile.py b/conanfile.py index 8b5be4498..4413026df 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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): diff --git a/optional/vtd/conanfile.py b/optional/vtd/conanfile.py index 306f7c04c..32239ab99 100644 --- a/optional/vtd/conanfile.py +++ b/optional/vtd/conanfile.py @@ -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: diff --git a/runtime/conanfile.py b/runtime/conanfile.py index 98999ed8d..d5d3c50c1 100644 --- a/runtime/conanfile.py +++ b/runtime/conanfile.py @@ -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 @@ -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: diff --git a/vendor/incbin/.gitignore b/vendor/incbin/.gitignore deleted file mode 100644 index 8eba6c8dd..000000000 --- a/vendor/incbin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -src/ diff --git a/vendor/incbin/CMakeLists.txt b/vendor/incbin/CMakeLists.txt deleted file mode 100644 index 13acab03a..000000000 --- a/vendor/incbin/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -cmake_minimum_required(VERSION 3.7 FATAL_ERROR) - -project(incbin LANGUAGES C) - -include(GNUInstallDirs) -include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS NO_OUTPUT_DIRS) - -add_library(incbin INTERFACE) -add_library(incbin::incbin ALIAS incbin) -target_include_directories(incbin INTERFACE - $ - $ -) - -option(INCBIN_HEADER_ONLY "Do not build the incbin executable." ON) -if(NOT INCBIN_HEADER_ONLY) - add_executable(incbin-gen incbin.c) - set_target_properties(incbin-gen PROPERTIES - OUTPUT_NAME "incbin" - ) - - install(TARGETS incbin-gen - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ) -endif() - -# Installation -install(FILES incbin.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -) -install(FILES README.md UNLICENSE - DESTINATION ${CMAKE_INSTALL_DOCDIR} -) -install(TARGETS incbin EXPORT incbin-config) -install(EXPORT incbin-config - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/incbin -) -export(TARGETS incbin - NAMESPACE incbin:: - FILE incbin-config.cmake -) diff --git a/vendor/incbin/Makefile b/vendor/incbin/Makefile deleted file mode 100644 index ac36db6c1..000000000 --- a/vendor/incbin/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Overrides will be preserved in Makefile.package. -override SOURCE_DIR := src -override PACKAGE_CHANNEL := cloe/stable -override CLEAN_SOURCE_DIR := true - -include ../../Makefile.package diff --git a/vendor/incbin/conanfile.py b/vendor/incbin/conanfile.py deleted file mode 100644 index b22539819..000000000 --- a/vendor/incbin/conanfile.py +++ /dev/null @@ -1,63 +0,0 @@ -import os.path -import shutil - -from conans import CMake, ConanFile, tools - - -class IncbinConan(ConanFile): - name = "incbin" - # Note that the below version 0.X.Y is a fictional version, where X is the - # number of commits in the repository and Y is the latest iteration of our - # changes. This is necessary because incbin doesn't have a version. - version = "0.88.0" - license = "Unlicense" - url = "/~https://github.com/graphitemaster/incbin" - git_url = "/~https://github.com/graphitemaster/incbin.git" - git_commit = "6e576cae5ab5810f25e2631f2e0b80cbe7dc8cbf" - git_dir = "incbin" - no_copy_source = True - description = "Include binary files in C/C++" - topics = ("embedded binary resources",) - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - options = { - "header_only": [True, False], - } - default_options = { - "header_only": True, - } - - exports_sources = ["CMakeLists.txt"] - - _cmake = None - - def source(self): - git = tools.Git(folder=self.git_dir) - git.clone(self.git_url) - git.checkout(self.git_commit) - dst = os.path.join(self.source_folder, self.git_dir) - shutil.copy("CMakeLists.txt", dst) - - def configure(self): - if self.options.header_only: - self.settings.clear() - - def _configure_cmake(self): - if self._cmake: - return self._cmake - self._cmake = CMake(self) - self._cmake.definitions["CMAKE_EXPORT_COMPILE_COMMANDS"] = True - self._cmake.definitions["INCBIN_HEADER_ONLY"] = self.options.header_only - self._cmake.configure(source_folder=self.git_dir) - return self._cmake - - def build(self): - cmake = self._configure_cmake() - cmake.build() - - def package(self): - cmake = self._configure_cmake() - cmake.install() - - def package_info(self): - self.cpp_info.libs = tools.collect_libs(self)