ogre: make xorg components more specific

conan-io · Oct 12, 2024 · 15ec300 · 15ec300
1 parent ac8d254
commit 15ec300
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/recipes/ogre/1.x/conanfile.py b/recipes/ogre/1.x/conanfile.py
@@ -605,21 +605,14 @@ def _add_plugin_component(comp, *, requires=None, extra_includedirs=None):
         )
         if self.settings.os in ["Linux", "FreeBSD"]:
             if self.options.use_wayland:
-                self.cpp_info.components["OgreMain"].requires.extend([
-                    "wayland::wayland-client",
-                    "wayland::wayland-egl",
-                ])
+                self.cpp_info.components["OgreMain"].requires.extend(["wayland::wayland-client", "wayland::wayland-egl"])
             else:
-                self.cpp_info.components["OgreMain"].requires.extend([
-                    "xorg::x11",
-                    "xorg::xaw7",
-                    "xorg::xext",
-                    "xorg::xrandr",
-                    "xorg::xt",
-                ])
+                self.cpp_info.components["OgreMain"].requires.extend(["xorg::x11", "xorg::xrandr"])
 
         if self.options.get_safe("build_component_bites"):
             _add_core_component("Bites", requires=["Overlay", "sdl::sdl"])
+            if self.settings.os in ["Linux", "FreeBSD"] and not self.options.use_wayland:
+                self.cpp_info.components["Bites"].requires.extend(["xorg::xaw7", "xorg::xt"])
         if self.options.get_safe("build_component_bullet"):
             _add_core_component("Bullet", requires=["bullet3::bullet3"])
         if self.options.build_component_meshlodgenerator: