From 15ec300387f284a9d423e91a89cbcde1c571ad41 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sat, 12 Oct 2024 10:23:53 +0300 Subject: [PATCH] ogre: make xorg components more specific --- recipes/ogre/1.x/conanfile.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/recipes/ogre/1.x/conanfile.py b/recipes/ogre/1.x/conanfile.py index f2452afe2e9c5..5719a10b6c351 100644 --- 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: