From 45a5b6a86bef8e50c9fdb4b327e17f88deba5dbe Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Thu, 26 Sep 2024 10:43:16 +0300 Subject: [PATCH] (#21238) brunsli: allow shared brotli dependency * brunsli: allow shared brotli dependency * brunsli: add requires --- recipes/brunsli/all/conanfile.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/brunsli/all/conanfile.py b/recipes/brunsli/all/conanfile.py index d437851b72dc54..6d0345f3e64af5 100644 --- a/recipes/brunsli/all/conanfile.py +++ b/recipes/brunsli/all/conanfile.py @@ -1,7 +1,6 @@ import os from conan import ConanFile -from conan.errors import ConanInvalidConfiguration from conan.tools.build import check_min_cppstd from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy, replace_in_file, save @@ -37,7 +36,6 @@ def config_options(self): def configure(self): if self.options.shared: self.options.rm_safe("fPIC") - self.options["brotli"].shared = False def layout(self): cmake_layout(self, src_folder="src") @@ -48,8 +46,6 @@ def requirements(self): def validate(self): if self.settings.compiler.cppstd: check_min_cppstd(self, 11) - if self.dependencies["brotli"].options.shared: - raise ConanInvalidConfiguration("brotli must be built as a static library") def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) @@ -94,7 +90,9 @@ def package(self): def package_info(self): self.cpp_info.components["brunslidec-c"].libs = ["brunslidec-c"] + self.cpp_info.components["brunslidec-c"].requires = ["brotli::brotlidec"] self.cpp_info.components["brunslienc-c"].libs = ["brunslienc-c"] + self.cpp_info.components["brunslienc-c"].requires = ["brotli::brotlienc"] if not self.options.shared: self.cpp_info.components["brunslidec-c"].libs += ["brunslicommon-static", "brunslidec-static"] self.cpp_info.components["brunslienc-c"].libs += ["brunslicommon-static", "brunslienc-static"]