Fix linking GL

This is a half fix. Projects that use the glvnd targets from CMake will
fail due to inconsistent detection of the GL libraries regardless of
settings.

Author: kwryankrattiger

repos/spack_repo/builtin/packages/apple_glu/package.py

@@ -14,3 +14,8 @@ class AppleGlu(AppleGlBase):
     provides("[email protected]")
 
     requires("platform=darwin", msg="Apple-GL is only available on Darwin")
+
+    def setup_dependent_build_environment(
+        self, env: EnvironmentModifications, dependent_spec: Spec):
+        env.prepend_path("OpenGL_ROOT", self.prefix)
+

repos/spack_repo/builtin/packages/glx/package.py

@@ -21,6 +21,10 @@ class Glx(BundlePackage):
     depends_on("libglx")
     provides("[email protected]")
 
+    def setup_dependent_build_environment(
+        self, env: EnvironmentModifications, dependent_spec: Spec):
+        env.prepend_path("OpenGL_ROOT", self.home)
+
     @property
     def home(self):
         return self.spec["libglx"].home

repos/spack_repo/builtin/packages/mesa/package.py

@@ -184,16 +184,7 @@ def cmake_extra_args(self):
         # TODO: egl
         # TODO: gles
         return [
-            f"-DOPENGL_INCLUDE_DIR:PATH={self.prefix}/include",
-            f"-DOPENGL_xmesa_INCLUDE_DIR:PATH={self.prefix}/include",
-            f"-DOPENGL_gl_LIBRARY:FILEPATH={glx_library}",
-            "-DOpenGL_GL_PREFERENCE:STRING=LEGACY",
-            "-DOPENGL_egl_LIBRARY:FILEPATH=",
-            f"-DOPENGL_glx_LIBRARY:FILEPATH={glx_library}",
-            f"-DOPENGL_opengl_LIBRARY:FILEPATH={glx_library}",
-            "-DOPENGL_EGL_INCLUDE_DIR:FILEPATH=",
-            f"-DOPENGL_GLX_INCLUDE_DIR:FILEPATH={self.prefix}/include",
-            "-DOPENGL_xmesa_INCLUDE_DIR:FILEPATH=",
+            "-DOpenGL_GL_PREFERENCE:STRING=LEGACY"
         ]
 
     @property

repos/spack_repo/builtin/packages/mesa_glu/package.py

@@ -26,6 +26,10 @@ class MesaGlu(AutotoolsPackage):
     # patch switches all instances of register long to long to fix this.
     patch("register-long.patch")
 
+    def setup_dependent_build_environment(
+        self, env: EnvironmentModifications, dependent_spec: Spec):
+        env.prepend_path("OpenGL_ROOT", self.prefix)
+
     def configure_args(self):
         args = ["--disable-libglvnd"]
 

repos/spack_repo/builtin/packages/openglu/package.py

@@ -64,6 +64,10 @@ def fetcher(self):
     def fetcher(self):
         _ = self.fetcher
 
+    def setup_dependent_build_environment(
+        self, env: EnvironmentModifications, dependent_spec: Spec):
+        env.prepend_path("OpenGL_ROOT", self.prefix)
+
     @property
     def libs(self):
         return find_libraries("libGLU", self.prefix, shared=True, recursive=True)

repos/spack_repo/builtin/packages/qt_base/package.py

@@ -230,7 +230,8 @@ class QtBase(QtPackage):
     # GL, provided by the Qt application is required at runtime.
     # Do not include GL in the "link" rpaths as GL may be loaded at runtime
     # and differ from the GL that provided the headers.
-    depends_on("gl", when="+opengl", type=("build"))
+    depends_on("gl", when="+opengl", type=("build", "link"))
+    depends_on("glu", when="+opengl", type=("build", "link"))
     depends_on("sqlite", when="+sql")
 
     with when("+gui"):