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

vtk: added v8.1.1, added option to disable libharu (#9475)

Browse Source 
* Added VTK 8.1.1, added option to disable libharu
* Add variant description to vtk+libharu
This commit is contained in:
sknigh 2018-10-10 14:57:28 -07:00 committed by Todd Gamblin
parent 113b750b89
commit aac8d52075
1 changed files with 10 additions and 1 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

@ -36,6 +36,7 @@ class Vtk(CMakePackage):
url = "http://www.vtk.org/files/release/8.0/VTK-8.0.1.tar.gz" url = "http://www.vtk.org/files/release/8.0/VTK-8.0.1.tar.gz"
list_url = "http://www.vtk.org/download/" list_url = "http://www.vtk.org/download/"
version('8.1.1', sha256='71a09b4340f0a9c58559fe946dc745ab68a866cf20636a41d97b6046cb736324')
version('8.0.1', '692d09ae8fadc97b59d35cab429b261a') version('8.0.1', '692d09ae8fadc97b59d35cab429b261a')
version('7.1.0', 'a7e814c1db503d896af72458c2d0228f') version('7.1.0', 'a7e814c1db503d896af72458c2d0228f')
version('7.0.0', '5fe35312db5fb2341139b8e4955c367d') version('7.0.0', '5fe35312db5fb2341139b8e4955c367d')
@ -48,6 +49,10 @@ class Vtk(CMakePackage):
variant('python', default=False, description='Enable Python support') variant('python', default=False, description='Enable Python support')
variant('qt', default=False, description='Build with support for Qt') variant('qt', default=False, description='Build with support for Qt')
# Haru causes trouble on Fedora and Ubuntu in v8.1.1
# See https://bugzilla.redhat.com/show_bug.cgi?id=1460059#c13
variant('haru', default=True, description='Enable libharu')
patch('gcc.patch', when='@6.1.0') patch('gcc.patch', when='@6.1.0')
# At the moment, we cannot build with both osmesa and qt, but as of # At the moment, we cannot build with both osmesa and qt, but as of
@ -69,13 +74,14 @@ class Vtk(CMakePackage):
# VTK will need Qt5OpenGL, and qt needs '-opengl' for that # VTK will need Qt5OpenGL, and qt needs '-opengl' for that
depends_on('qt+opengl', when='+qt') depends_on('qt+opengl', when='+qt')
depends_on('libharu', when='+haru')
depends_on('expat') depends_on('expat')
depends_on('freetype') depends_on('freetype')
depends_on('glew') depends_on('glew')
depends_on('hdf5') depends_on('hdf5')
depends_on('libjpeg') depends_on('libjpeg')
depends_on('jsoncpp') depends_on('jsoncpp')
depends_on('libharu')
depends_on('libxml2') depends_on('libxml2')
depends_on('lz4') depends_on('lz4')
depends_on('netcdf') depends_on('netcdf')
@ -104,6 +110,9 @@ def cmake_args(self):
'-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_LIBHARU=%s' % (
'ON' if '+haru' in spec else 'OFF'),
# In general, we disable use of VTK "ThirdParty" libs, preferring # In general, we disable use of VTK "ThirdParty" libs, preferring
# spack-built versions whenever possible # spack-built versions whenever possible
'-DVTK_USE_SYSTEM_LIBRARIES=ON', '-DVTK_USE_SYSTEM_LIBRARIES=ON',