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

Get vtk-8.2.0 to build (#14562)

Browse Source 
This PR adds some extra dependencies needed for vtk-8.2.0. It also
handles the variable name changes to turn off some of the external
libraries.
This commit is contained in:
Glenn Johnson 2020-01-25 12:44:51 -06:00 committed by Adam J. Stewart
parent f569577747
commit c700200959
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,9 @@ class Vtk(CMakePackage):
depends_on('libpng') depends_on('libpng')
depends_on('libtiff') depends_on('libtiff')
depends_on('zlib') depends_on('zlib')
depends_on('eigen', when='@8.2.0:')
depends_on('double-conversion', when='@8.2.0:')
depends_on('sqlite', when='@8.2.0:')
def url_for_version(self, version): def url_for_version(self, version):
url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz" url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz"
@ -117,8 +120,6 @@ def cmake_args(self):
# However, in a few cases we can't do without them yet # However, in a few cases we can't do without them yet
'-DVTK_USE_SYSTEM_GL2PS:BOOL=OFF', '-DVTK_USE_SYSTEM_GL2PS:BOOL=OFF',
'-DVTK_USE_SYSTEM_LIBHARU=OFF', '-DVTK_USE_SYSTEM_LIBHARU=OFF',
'-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF',
'-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=OFF',
'-DNETCDF_DIR={0}'.format(spec['netcdf-c'].prefix), '-DNETCDF_DIR={0}'.format(spec['netcdf-c'].prefix),
'-DNETCDF_C_ROOT={0}'.format(spec['netcdf-c'].prefix), '-DNETCDF_C_ROOT={0}'.format(spec['netcdf-c'].prefix),
@ -132,6 +133,20 @@ def cmake_args(self):
'-DVTK_WRAP_TCL=OFF', '-DVTK_WRAP_TCL=OFF',
] ]
# Some variable names have changed
if spec.satisfies('@8.2.0:'):
cmake_args.extend([
'-DVTK_USE_SYSTEM_OGG:BOOL=OFF',
'-DVTK_USE_SYSTEM_THEORA:BOOL=OFF',
'-DVTK_USE_SYSTEM_LIBPROJ:BOOL=OFF',
'-DVTK_USE_SYSTEM_PUGIXML:BOOL=OFF',
])
else:
cmake_args.extend([
'-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=OFF',
'-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF',
])
if '+mpi' in spec: if '+mpi' in spec:
cmake_args.extend([ cmake_args.extend([
'-DVTK_Group_MPI:BOOL=ON', '-DVTK_Group_MPI:BOOL=ON',