diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-14 11:29:46 +0200 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-14 11:29:46 +0200 |
| commit | d6a232dbe04cf92bf9fd42a2c5fb4233ef8edf71 (patch) | |
| tree | 39890db7c6802c01e7c7c8602b8fffa306d50fca | |
| parent | f8543f7755c2d2bdd5a7edca1e27a524dd8b7f5e (diff) | |
| parent | 20b9f34b5c650eefb23f4118bb52985c468a9098 (diff) | |
| download | spack-d6a232dbe04cf92bf9fd42a2c5fb4233ef8edf71.tar.gz spack-d6a232dbe04cf92bf9fd42a2c5fb4233ef8edf71.tar.bz2 spack-d6a232dbe04cf92bf9fd42a2c5fb4233ef8edf71.tar.xz spack-d6a232dbe04cf92bf9fd42a2c5fb4233ef8edf71.zip | |
Merge pull request #767 from mathstuf/paraview-fixes
Paraview fixes
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index c16054816c..60f8d3c243 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -27,13 +27,14 @@ class Paraview(Package): depends_on('bzip2') depends_on('freetype') - depends_on('hdf5+mpi', when='+mpi') - depends_on('hdf5~mpi', when='~mpi') + #depends_on('hdf5+mpi', when='+mpi') + #depends_on('hdf5~mpi', when='~mpi') depends_on('jpeg') depends_on('libpng') depends_on('libtiff') depends_on('libxml2') - depends_on('netcdf') + #depends_on('netcdf') + #depends_on('netcdf-cxx') #depends_on('protobuf') # version mismatches? #depends_on('sqlite') # external version not supported depends_on('zlib') @@ -75,13 +76,13 @@ class Paraview(Package): cmake('..', '-DCMAKE_INSTALL_PREFIX:PATH=%s' % prefix, '-DBUILD_TESTING:BOOL=OFF', - '-DVTK_USER_SYSTEM_FREETYPE:BOOL=ON', - '-DVTK_USER_SYSTEM_HDF5:BOOL=ON', - '-DVTK_USER_SYSTEM_JPEG:BOOL=ON', - '-DVTK_USER_SYSTEM_LIBXML2:BOOL=ON', - '-DVTK_USER_SYSTEM_NETCDF:BOOL=ON', - '-DVTK_USER_SYSTEM_TIFF:BOOL=ON', - '-DVTK_USER_SYSTEM_ZLIB:BOOL=ON', + '-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON', + '-DVTK_USE_SYSTEM_HDF5:BOOL=OFF', + '-DVTK_USE_SYSTEM_JPEG:BOOL=ON', + '-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON', + '-DVTK_USE_SYSTEM_NETCDF:BOOL=OFF', + '-DVTK_USE_SYSTEM_TIFF:BOOL=ON', + '-DVTK_USE_SYSTEM_ZLIB:BOOL=ON', *feature_args) make() make('install') |