From a37efefd3d335a01dafe51d014faac481d64d472 Mon Sep 17 00:00:00 2001
From: Omar Padron <omar.padron@kitware.com>
Date: Wed, 22 May 2019 12:04:29 -0400
Subject: package vtk - improve gl handling (#11530)

* package vtk - improve gl handling

* package vtk - minor cleanup
---
 var/spack/repos/builtin/packages/vtk/package.py | 41 ++++++++++++-------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py
index 3b133b26d9..031bb210d0 100644
--- a/var/spack/repos/builtin/packages/vtk/package.py
+++ b/var/spack/repos/builtin/packages/vtk/package.py
@@ -195,34 +195,33 @@ class Vtk(CMakePackage):
             if '+mpi' in spec:
                 cmake_args.extend(["-DModule_vtkIOParallelXdmf3:BOOL=ON"])
 
-        if '+osmesa' in spec:
-            prefix = spec['mesa'].prefix
-            osmesa_include_dir = prefix.include
-            osmesa_library = os.path.join(prefix.lib, 'libOSMesa.so')
+        cmake_args.extend([
+            '-DVTK_USE_SYSTEM_GLEW:BOOL=ON',
 
-            use_param = 'VTK_USE_X'
-            if 'darwin' in spec.architecture:
-                use_param = 'VTK_USE_COCOA'
+            '-DVTK_RENDERING_BACKEND:STRING=OpenGL{0}'.format(
+                '2' if '+opengl2' in spec else ''),
+        ])
 
+        if '+osmesa' in spec:
             cmake_args.extend([
-                '-D{0}:BOOL=OFF'.format(use_param),
-                '-DVTK_OPENGL_HAS_OSMESA:BOOL=ON',
-                '-DOSMESA_INCLUDE_DIR:PATH={0}'.format(osmesa_include_dir),
-                '-DOSMESA_LIBRARY:FILEPATH={0}'.format(osmesa_library),
-            ])
+                '-DVTK_USE_X:BOOL=OFF',
+                '-DVTK_USE_COCOA:BOOL=OFF',
+                '-DVTK_OPENGL_HAS_OSMESA:BOOL=ON'])
+
         else:
-            prefix = spec['opengl'].prefix
+            cmake_args.extend([
+                '-DVTK_OPENGL_HAS_OSMESA:BOOL=OFF',
+                '-DOpenGL_GL_PREFERENCE:STRING=LEGACY'])
 
-            opengl_include_dir = prefix.include
-            opengl_library = os.path.join(prefix.lib, 'libGL.so')
             if 'darwin' in spec.architecture:
-                opengl_include_dir = prefix
-                opengl_library = prefix
+                cmake_args.extend([
+                    '-DVTK_USE_X:BOOL=OFF',
+                    '-DVTK_USE_COCOA:BOOL=ON'])
 
-            cmake_args.extend([
-                '-DOPENGL_INCLUDE_DIR:PATH={0}'.format(opengl_include_dir),
-                '-DOPENGL_gl_LIBRARY:FILEPATH={0}'.format(opengl_library)
-            ])
+            elif 'linux' in spec.architecture:
+                cmake_args.extend([
+                    '-DVTK_USE_X:BOOL=ON',
+                    '-DVTK_USE_COCOA:BOOL=OFF'])
 
         if spec.satisfies('@:6.1.0'):
             cmake_args.extend([
-- 
cgit v1.2.3-60-g2f50