zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove std_cmake_args from VTK definition (#6856)

Browse Source
This commit is contained in:
Adam J. Stewart 2018-01-09 01:56:00 -06:00 committed by Massimiliano Culpo
parent 697f1061c5
commit eb42013727
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/vtk/package.py
View File

@ -64,8 +64,7 @@ def cmake_args(self):
qt_ver = spec['qt'].version.up_to(1) qt_ver = spec['qt'].version.up_to(1)
qt_bin = spec['qt'].prefix.bin qt_bin = spec['qt'].prefix.bin
cmake_args = std_cmake_args[:] cmake_args = [
cmake_args.extend([
'-DBUILD_SHARED_LIBS=ON', '-DBUILD_SHARED_LIBS=ON',
'-DVTK_RENDERING_BACKEND:STRING={0}'.format(opengl_ver), '-DVTK_RENDERING_BACKEND:STRING={0}'.format(opengl_ver),
'-DVTK_USE_SYSTEM_HDF5=ON', '-DVTK_USE_SYSTEM_HDF5=ON',
@ -86,7 +85,7 @@ def cmake_args(self):
'-DVTK_QT_VERSION:STRING={0}'.format(qt_ver), '-DVTK_QT_VERSION:STRING={0}'.format(qt_ver),
'-DQT_QMAKE_EXECUTABLE:PATH={0}/qmake'.format(qt_bin), '-DQT_QMAKE_EXECUTABLE:PATH={0}/qmake'.format(qt_bin),
'-DVTK_Group_Qt:BOOL=ON', '-DVTK_Group_Qt:BOOL=ON',
]) ]
# NOTE: The following definitions are required in order to allow # NOTE: The following definitions are required in order to allow
# VTK to build with qt~webkit versions (see the documentation for # 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'): if spec.satisfies('@:6.1.0'):
cmake_args.append('-DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY') cmake_args.extend([
cmake_args.append('-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY') '-DCMAKE_C_FLAGS=-DGLX_GLXEXT_LEGACY',
'-DCMAKE_CXX_FLAGS=-DGLX_GLXEXT_LEGACY'
])
return cmake_args return cmake_args