diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2019-04-30 04:07:29 -0400 |
|---|---|---|
| committer | Axel Huebl <axel.huebl@plasma.ninja> | 2019-04-30 10:07:29 +0200 |
| commit | d2a5a10f08961c4b70d834af380f632799383445 (patch) | |
| tree | e876543434967599fa9aa3f6e8a80b185d7feefb /var | |
| parent | 1a920ee64f06edab9276833b0d27bb27cbb524fc (diff) | |
| download | spack-d2a5a10f08961c4b70d834af380f632799383445.tar.gz spack-d2a5a10f08961c4b70d834af380f632799383445.tar.bz2 spack-d2a5a10f08961c4b70d834af380f632799383445.tar.xz spack-d2a5a10f08961c4b70d834af380f632799383445.zip | |
vtk: Use the vendored libharu (#11293)
VTK requires a patched libharu that is not maintained upstream
See https://github.com/libharu/libharu/pull/157
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/vtk/package.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index fcd2abc2ab..15f71e005d 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -34,10 +34,6 @@ class Vtk(CMakePackage): variant('ffmpeg', default=False, description='Build with FFMPEG support') variant('mpi', default=True, description='Enable MPI support') - # 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') # At the moment, we cannot build with both osmesa and qt, but as of @@ -68,8 +64,6 @@ class Vtk(CMakePackage): depends_on('mpi', when='+mpi') - depends_on('libharu', when='+haru') - depends_on('boost', when='+xdmf') depends_on('boost+mpi', when='+xdmf +mpi') @@ -109,15 +103,13 @@ class Vtk(CMakePackage): '-DBUILD_SHARED_LIBS=ON', '-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 # spack-built versions whenever possible '-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON', # However, in a few cases we can't do without them yet '-DVTK_USE_SYSTEM_GL2PS:BOOL=OFF', + '-DVTK_USE_SYSTEM_LIBHARU=OFF', '-DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF', '-DVTK_USE_SYSTEM_OGGTHEORA:BOOL=OFF', |