diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-11-23 16:04:03 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-11-23 16:04:03 -0800 |
| commit | 0011903e23d344723d6146c50ff73ab569731a4e (patch) | |
| tree | 2b8f8b870874d9e66c76327f32ee7c4458c6ae59 /var | |
| parent | 9bc27561ec369b6e9748a3741ad79515576fd666 (diff) | |
| parent | 485528cffa42960815fb4716d6a468cde43bf501 (diff) | |
| download | spack-0011903e23d344723d6146c50ff73ab569731a4e.tar.gz spack-0011903e23d344723d6146c50ff73ab569731a4e.tar.bz2 spack-0011903e23d344723d6146c50ff73ab569731a4e.tar.xz spack-0011903e23d344723d6146c50ff73ab569731a4e.zip | |
Merge pull request #165 from mathstuf/paraview-update-deps
Paraview update deps
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/paraview/package.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/packages/paraview/package.py b/var/spack/packages/paraview/package.py index 8c860bf65b..447376a376 100644 --- a/var/spack/packages/paraview/package.py +++ b/var/spack/packages/paraview/package.py @@ -20,7 +20,7 @@ class Paraview(Package): depends_on('py-matplotlib', when='+python') depends_on('tcl', when='+tcl') depends_on('mpi', when='+mpi') - depends_on('qt', when='+qt') + depends_on('qt@:4', when='+qt') depends_on('bzip2') depends_on('freetype') @@ -47,7 +47,11 @@ class Paraview(Package): feature_args = std_cmake_args[:] feature_args.append('-DPARAVIEW_BUILD_QT_GUI:BOOL=%s' % feature_to_bool('+qt')) feature_args.append('-DPARAVIEW_ENABLE_PYTHON:BOOL=%s' % feature_to_bool('+python')) + if '+python' in spec: + feature_args.append('-DPYTHON_EXECUTABLE:FILEPATH=%s/bin/python' % spec['python'].prefix) feature_args.append('-DPARAVIEW_USE_MPI:BOOL=%s' % feature_to_bool('+mpi')) + if '+mpi' in spec: + feature_args.append('-DMPIEXEC:FILEPATH=%s/bin/mpiexec' % spec['mpi'].prefix) feature_args.append('-DVTK_ENABLE_TCL_WRAPPING:BOOL=%s' % feature_to_bool('+tcl')) feature_args.append('-DVTK_OPENGL_HAS_OSMESA:BOOL=%s' % feature_to_bool('+osmesa')) feature_args.append('-DVTK_USE_X:BOOL=%s' % nfeature_to_bool('+osmesa')) |