diff options
| -rw-r--r-- | conan.lock | 16 | ||||
| -rw-r--r-- | conanfile.py | 6 | ||||
| -rw-r--r-- | source/lib/system/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | test_package/conanfile.py | 1 |
4 files changed, 20 insertions, 13 deletions
@@ -3,18 +3,32 @@ "requires": [ "zlib/1.2.13#e377bee636333ae348d51ca90874e353%1682597484.674", "spdlog/1.12.0#c5fc262786548cbac34e6c38e16309a9%1688915175.09", + "pcre2/10.42#2079a0447f9652dffcbbf1eb73ae2d4e%1670876061.516", "lyra/1.6.1#7ec368ee0f9ba9f34ae72e466d2b3b51%1667926079.486", + "libselinux/3.3#1bb9670b14ef607941dd43bf155ce7e3%1676549596.763", "libpng/1.6.40#3b63a2aa000933a57a53322207790714%1687968865.34", + "libmount/2.36.2#6820ca7dcf3e62148b7b60049a5ae6e5%1685457161.128", "libjpeg/9e#68269859e4325ddc3f995d1fd3fc9187%1674953155.168", + "libffi/3.4.4#35eb63842b505824b70aedc1baefc916%1682741110.044", + "libelf/0.8.13#4f70a3555809ae50cc8add44f0f84288%1682439923.579", "libbacktrace/cci.20210118#ec1aa63bbc10145c6a299e68e711670c%1676205469.545", + "glib/2.77.1#b6d713e91501fb23f888224e7c4ee2c2%1691248442.455", "fmt/10.0.0#dd5e3eb81b512a1bb34a5aab88a07e82%1684225718.04", "bzip2/1.0.8#411fc05e80d47a89045edc1ee6f23c1d%1678293522.814", "boost/1.82.0#902463606663219fc8c6d2102f1b8c6a%1685704970.086", "asio/1.28.1#9b4fb4d434f6b12dc44c116b57f6e25d%1691066750.28" ], "build_requires": [ + "pkgconf/1.9.3#5da3944c3226f5764374e4b8b4e1d055%1688570267.668", + "ninja/1.11.1#77587f8c8318662ac8e5a7867eb4be21%1684431244.21", + "meson/1.1.0#6176e4f21370f5820c27da02836c32c9%1681198138.083", + "meson/1.0.0#15586c0ac6f682805875ef903dbe7ee2%1673885561.647", + "m4/1.4.19#c1c4b1ee919e34630bb9b50046253d3c%1676610086.39", + "gnu-config/cci.20210814#15c3bf7dfdb743977b84d0321534ad90%1681250000.747", + "flex/2.6.4#e35bc44b3fcbcd661e0af0dc5b5b1ad4%1674818991.113", "cmake/3.27.1#7d5f14447c023feef9f59640be53619a%1691315387.882", - "b2/4.9.6#53783bdbbdbb6c13732b25f1f6ea6c58%1686399756.948" + "b2/4.9.6#53783bdbbdbb6c13732b25f1f6ea6c58%1686399756.948", + "autoconf/2.71#ce232afdcd21d1269419c355375731e6%1688493320.427" ], "python_requires": [] }
\ No newline at end of file diff --git a/conanfile.py b/conanfile.py index 3562475..e339c28 100644 --- a/conanfile.py +++ b/conanfile.py @@ -29,6 +29,7 @@ class Wanda(ConanFile): "asio/[~1.28]", "boost/[~1.82]", "fmt/[~10.0]", + "glib/[~2]", "libjpeg/9e", "libpng/[~1.6]", "lyra/[~1.6]", @@ -79,14 +80,11 @@ class Wanda(ConanFile): # requires "boost::boost", "fmt::fmt", + "glib::gio-2.0", "libjpeg::libjpeg", "libpng::libpng", "spdlog::spdlog", ] - self.cpp_info.components["system"].system_libs = [ - "glib2", - "magic", - ] self.cpp_info.components["wandac"].libs = [] self.cpp_info.components["wandac"].requires = [ diff --git a/source/lib/system/CMakeLists.txt b/source/lib/system/CMakeLists.txt index 813bcc7..0ca1b28 100644 --- a/source/lib/system/CMakeLists.txt +++ b/source/lib/system/CMakeLists.txt @@ -8,16 +8,10 @@ find_package("fmt" REQUIRED) find_package("JPEG" REQUIRED) find_package("PNG" REQUIRED) find_package("spdlog" REQUIRED) +find_package("glib" REQUIRED) find_package("PkgConfig" REQUIRED) -pkg_check_modules("GIO" - REQUIRED - IMPORTED_TARGET - GLOBAL - "gio-2.0" -) - pkg_check_modules("libmagic" REQUIRED IMPORTED_TARGET @@ -53,11 +47,11 @@ target_link_libraries("wanda-${LIB_NAME}" PUBLIC "boost::boost" "fmt::fmt" + "glib::gio-2.0" "JPEG::JPEG" "PNG::PNG" "spdlog::spdlog" - "PkgConfig::GIO" "PkgConfig::libmagic" ) diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 6c01007..945bebf 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -11,6 +11,7 @@ class WandaTestConan(ConanFile): def requirements(self): self.requires(self.tested_reference_str) + self.requires("asio/[~1.28]") def build(self): cmake = CMake(self) |