Skip to content

Commit

Permalink
fltk: Use the mesa-glu Conan package
Browse files Browse the repository at this point in the history
This is done the same way as for the FreeGLUT package in #22428.
Fixes #22944.
  • Loading branch information
jwillikers committed Apr 10, 2024
1 parent c47e5aa commit 81955e8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions recipes/fltk/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ def requirements(self):
if self.settings.os in ["Linux", "FreeBSD"]:
if self.options.with_gl:
self.requires("opengl/system")
self.requires("glu/system")
if is_apple_os(self) or self.settings.os == "Windows":
self.requires("glu/system")
else:
self.requires("mesa-glu/9.0.3")
self.requires("fontconfig/2.15.0")
self.requires("xorg/system")
if self.options.with_xft:
Expand Down Expand Up @@ -125,7 +128,7 @@ def package_info(self):
if self.options.with_threads:
self.cpp_info.system_libs.extend(["pthread", "dl"])
if self.options.with_gl:
self.cpp_info.system_libs.extend(["GL", "GLU"])
self.cpp_info.system_libs.extend(["GL"])
elif is_apple_os(self):
self.cpp_info.frameworks = [
"AppKit", "ApplicationServices", "Carbon", "Cocoa", "CoreFoundation", "CoreGraphics",
Expand Down

0 comments on commit 81955e8

Please sign in to comment.