Skip to content

Commit

Permalink
(#23440) freeglut: Don't require xkbcommon's with_wayland option
Browse files Browse the repository at this point in the history
* freeglut: Don't require xkbcommon's with_wayland option

This option only enables building Wayland utility programs, not the library.
I added this previously, so I'm fixing my mistake.

* Remove opengl/system requirement from test package
  • Loading branch information
jwillikers authored Apr 16, 2024
1 parent 68ff5d6 commit 54f1769
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
4 changes: 0 additions & 4 deletions recipes/freeglut/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ def configure(self):
self.options["libglvnd"].gles2 = True
if self._requires_libglvnd_glx:
self.options["libglvnd"].glx = True
if self.options.get_safe("with_wayland"):
self.options["xkbcommon"].with_wayland = True

def layout(self):
cmake_layout(self, src_folder="src")
Expand Down Expand Up @@ -126,8 +124,6 @@ def validate(self):
raise ConanInvalidConfiguration(f"{self.ref} requires the gles2 option of libglvnd to be enabled when the gles option is enabled")
if self._requires_libglvnd_glx and not self.dependencies["libglvnd"].options.glx:
raise ConanInvalidConfiguration(f"{self.ref} requires the glx option of libglvnd to be enabled when the gles option is disabled")
if self.options.get_safe("with_wayland") and not self.dependencies["xkbcommon"].options.with_wayland:
raise ConanInvalidConfiguration(f"{self.ref} requires the with_wayland option of xkbcommon to be enabled when the with_wayland option is enabled")


def source(self):
Expand Down
1 change: 0 additions & 1 deletion recipes/freeglut/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def layout(self):

def requirements(self):
self.requires(self.tested_reference_str)
self.requires("opengl/system")

def build(self):
cmake = CMake(self)
Expand Down
1 change: 0 additions & 1 deletion recipes/freeglut/all/test_package_module/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def layout(self):

def requirements(self):
self.requires(self.tested_reference_str)
self.requires("opengl/system")

def build(self):
cmake = CMake(self)
Expand Down

0 comments on commit 54f1769

Please sign in to comment.