(conan-io#21238) brunsli: allow shared brotli dependency

* brunsli: allow shared brotli dependency * brunsli: add requires
OMGtechy · Dec 31, 2024 · 45a5b6a · 45a5b6a
1 parent 484f7c2
commit 45a5b6a
Showing 1 changed file with 2 additions and 4 deletions.
diff --git 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"]