diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2019-05-16 09:04:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 09:04:44 -0400 |
| commit | c2d6095cf39dc914bb4d14b2ddd96281dc9894ff (patch) | |
| tree | 9a68a4c1684e99b2b375df43141266189d55c3bc /var | |
| parent | 7fcf534b253c3c670c0104134965bcc43961e86b (diff) | |
| download | spack-c2d6095cf39dc914bb4d14b2ddd96281dc9894ff.tar.gz spack-c2d6095cf39dc914bb4d14b2ddd96281dc9894ff.tar.bz2 spack-c2d6095cf39dc914bb4d14b2ddd96281dc9894ff.tar.xz spack-c2d6095cf39dc914bb4d14b2ddd96281dc9894ff.zip | |
paraview: fix several dependency issues (#11432)
* Use externally provided mpi4py
* Make mpi4py and numpy both build deps instead of only run deps
* libxt is only on ~osmesa platform=linux
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index f0b5e3e190..221565a541 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -38,7 +38,8 @@ class Paraview(CMakePackage): variant('hdf5', default=False, description="Use external HDF5") depends_on('python@2:2.8', when='+python') - depends_on('py-numpy', when='+python', type='run') + depends_on('py-numpy', when='+python', type=('build', 'run')) + depends_on('py-mpi4py', when='+python+mpi', type=('build', 'run')) # Matplotlib >2.x requires Python 3 depends_on('py-matplotlib@:2.99', when='+python', type='run') depends_on('mpi', when='+mpi') @@ -49,7 +50,7 @@ class Paraview(CMakePackage): depends_on('mesa+osmesa', when='+osmesa') depends_on('gl@3.2:', when='+opengl2') depends_on('gl@1.2:', when='~opengl2') - depends_on('libxt', when='+qt') + depends_on('libxt', when='~osmesa platform=linux') conflicts('+qt', when='+osmesa') depends_on('bzip2') @@ -167,6 +168,7 @@ class Paraview(CMakePackage): '-DVTK_USE_SYSTEM_HDF5:BOOL=%s' % variant_bool('+hdf5'), '-DVTK_USE_SYSTEM_JPEG:BOOL=ON', '-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON', + '-DVTK_USE_SYSTEM_MPI4PY:BOOL=%s' % variant_bool('+python+mpi'), '-DVTK_USE_SYSTEM_NETCDF:BOOL=ON', '-DVTK_USE_SYSTEM_EXPAT:BOOL=ON', '-DVTK_USE_SYSTEM_TIFF:BOOL=ON', |