From eb42013727a31faacb0cc35b39661cf807405e6a Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Tue, 9 Jan 2018 01:56:00 -0600
Subject: [PATCH] Remove std_cmake_args from VTK definition (#6856)
---
var/spack/repos/builtin/packages/vtk/package.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py
index 0ab9a1a131..f5b95108c9 100644
--- a/var/spack/repos/builtin/packages/vtk/package.py
+++ b/var/spack/repos/builtin/packages/vtk/package.py
@@ -64,8 +64,7 @@ def cmake_args(self):
qt_ver = spec['qt'].version.up_to(1)
qt_bin = spec['qt'].prefix.bin
- cmake_args = std_cmake_args[:]
- cmake_args.extend([
+ cmake_args = [
'-DBUILD_SHARED_LIBS=ON',
'-DVTK_RENDERING_BACKEND:STRING={0}'.format(opengl_ver),
'-DVTK_USE_SYSTEM_HDF5=ON',
@@ -86,7 +85,7 @@ def cmake_args(self):
'-DVTK_QT_VERSION:STRING={0}'.format(qt_ver),
'-DQT_QMAKE_EXECUTABLE:PATH={0}/qmake'.format(qt_bin),
'-DVTK_Group_Qt:BOOL=ON',
- ])
+ ]
# NOTE: The following definitions are required in order to allow
# VTK to build with qt~webkit versions (see the documentation for
@@ -99,7 +98,9 @@ def cmake_args(self):
])
if spec.satisfies('@:6.1.0'):
- cmake_args.append('-DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY')
- cmake_args.append('-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY')
+ cmake_args.extend([
+ '-DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY',
+ '-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY'
+ ])
return cmake_args
--
GitLab