diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2023-09-06 21:09:29 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2023-09-06 21:09:29 +0200 |
| commit | 4c68156184be63e75f54f5b8b06a640d7d2a497a (patch) | |
| tree | 0b97b651d1a0b4c5742e561b3a345da7e145f669 /conanfile.py | |
| parent | 17a3bb9337fd7e4a57354ed5359e449d5ab1388c (diff) | |
| download | wanda-4c68156184be63e75f54f5b8b06a640d7d2a497a.tar.xz wanda-4c68156184be63e75f54f5b8b06a640d7d2a497a.zip | |
deps: remove asio remnants and fix fmt
Diffstat (limited to 'conanfile.py')
| -rw-r--r-- | conanfile.py | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/conanfile.py b/conanfile.py index 9e89939..5023db5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -26,28 +26,28 @@ class Wanda(ConanFile): "build_type", ) exports_sources = ("source/*",) - requires = ( - "boost/[~1.83]", - "libjpeg-turbo/[~3.0]", - "libpng/[~1.6]", - "lyra/[~1.6]", - "spdlog/[~1.12]", - ) test_requires = ("catch2/[>=3.4]",) tool_requires = ("cmake/[>=3.27]",) + def requirements(self): + self.requires("boost/[~1.83]", transitive_headers=True, options={ + "asio_no_deprecated": True, + "system_no_deprecated": True, + "header_only": True, + }) + self.requires("libjpeg-turbo/[~3.0]") + self.requires("libpng/[~1.6]") + self.requires("lyra/[~1.6]") + self.requires("spdlog/[~1.12]", transitive_headers=True, options={ + "header_only": True, + }) + def build(self): cmake = CMake(self) cmake.configure() cmake.build() cmake.test(env="CTEST_OUTPUT_ON_FAILURE=1") - def configure(self): - self.options["boost"].asio_no_deprecated = True - self.options["boost"].header_only = True - self.options["fmt"].header_only = True - self.options["spdlog"].header_only = True - def generate(self): toolchain = CMakeToolchain(self) toolchain.variables["CMAKE_EXPORT_COMPILE_COMMANDS"] = True @@ -70,14 +70,14 @@ class Wanda(ConanFile): "std_ext", "system", # requires - "asio::asio", + "boost::headers", "spdlog::spdlog", ] self.cpp_info.components["meta"].libs = [] self.cpp_info.components["proto"].libs = ["wanda-proto"] - self.cpp_info.components["proto"].requires = ["fmt::fmt"] + self.cpp_info.components["proto"].requires = ["spdlog::spdlog",] self.cpp_info.components["std_ext"].libs = [] @@ -86,8 +86,7 @@ class Wanda(ConanFile): "meta", "std_ext", # requires - "boost::boost", - "fmt::fmt", + "boost::headers", "libjpeg-turbo::jpeg", "libpng::libpng", "spdlog::spdlog", @@ -99,7 +98,6 @@ class Wanda(ConanFile): "proto", "system", # requires - "asio::asio", "lyra::lyra", "spdlog::spdlog", ] @@ -114,7 +112,6 @@ class Wanda(ConanFile): "std_ext", "system", # requires - "asio::asio", "lyra::lyra", "spdlog::spdlog", ] |