summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2018-01-09 01:56:00 -0600
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2018-01-09 08:56:00 +0100
commiteb42013727a31faacb0cc35b39661cf807405e6a (patch)
tree4aa46ec13a28ed094977818dde755f80c91d882c /var
parent697f1061c5eb874ce2cb30dae501c1ed80a89342 (diff)
downloadspack-eb42013727a31faacb0cc35b39661cf807405e6a.tar.gz
spack-eb42013727a31faacb0cc35b39661cf807405e6a.tar.bz2
spack-eb42013727a31faacb0cc35b39661cf807405e6a.tar.xz
spack-eb42013727a31faacb0cc35b39661cf807405e6a.zip
Remove std_cmake_args from VTK definition (#6856)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/vtk/package.py11
1 files 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 @@ class Vtk(CMakePackage):
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 @@ class Vtk(CMakePackage):
'-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 @@ class Vtk(CMakePackage):
])
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