Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pcl: Use the mesa-glu Conan package #22957

Merged
merged 1 commit into from
Mar 8, 2024
Merged

pcl: Use the mesa-glu Conan package #22957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions recipes/pcl/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.apple import is_apple_os
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, rmdir, rm
Expand Down Expand Up @@ -212,7 +213,7 @@ def _ext_dep_to_conan_target(self, dep):
"libusb": ["libusb::libusb"],
"metslib": [],
"opencv": ["opencv::opencv"],
"opengl": ["opengl::opengl", "freeglut::freeglut", "glew::glew", "glu::glu"],
"opengl": ["opengl::opengl", "freeglut::freeglut", "glew::glew", "glu::glu" if is_apple_os(self) or self.settings.os == "Windows" else "mesa-glu::mesa-glu"],
"openni": [],
"openni2": [],
"pcap": ["libpcap::libpcap"],
Expand Down Expand Up @@ -380,7 +381,10 @@ def requirements(self):
self.requires("opengl/system", transitive_headers=True)
self.requires("freeglut/3.4.0", transitive_headers=True)
self.requires("glew/2.2.0", transitive_headers=True)
self.requires("glu/system", transitive_headers=True)
if is_apple_os(self) or self.settings.os == "Windows":
self.requires("glu/system", transitive_headers=True)
else:
self.requires("mesa-glu/9.0.3", transitive_headers=True)
if self._is_enabled("opencv"):
self.requires("opencv/4.8.1", transitive_headers=True)
if self._is_enabled("zlib"):
Expand Down
Loading