summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Lipsa <dan.lipsa@kitware.com>2020-02-12 13:24:09 -0500
committerGitHub <noreply@github.com>2020-02-12 13:24:09 -0500
commitca66ab69017d75b2170bc95e96c438553f27337b (patch)
tree04b70bed9ed46e4b1d61c0c16fd123a0dd15e38a
parent3b2c534e73bb8b6945c133adf0ec4983eb90d897 (diff)
downloadspack-ca66ab69017d75b2170bc95e96c438553f27337b.tar.gz
spack-ca66ab69017d75b2170bc95e96c438553f27337b.tar.bz2
spack-ca66ab69017d75b2170bc95e96c438553f27337b.tar.xz
spack-ca66ab69017d75b2170bc95e96c438553f27337b.zip
Paraview: fix PYTHONPATH for static build. (#14648)
* Fix PYTHONPATH for static build. * Only for the latest version.
-rw-r--r--var/spack/repos/builtin/packages/paraview/package.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py
index 823e9b0f03..111c8df7a4 100644
--- a/var/spack/repos/builtin/packages/paraview/package.py
+++ b/var/spack/repos/builtin/packages/paraview/package.py
@@ -169,11 +169,18 @@ class Paraview(CMakePackage, CudaPackage):
pv_pydir = join_path(lib_dir,
'python{0}'.format(python_version),
'site-packages')
- env.prepend_path('PYTHONPATH', pv_pydir)
- # The Trilinos Catalyst adapter requires
- # the vtkmodules directory in PYTHONPATH
- env.prepend_path('PYTHONPATH', join_path(pv_pydir,
- 'vtkmodules'))
+ if '+shared' in self.spec or \
+ self.spec.version <= Version('5.7.0'):
+ env.prepend_path('PYTHONPATH', pv_pydir)
+ # The Trilinos Catalyst adapter requires
+ # the vtkmodules directory in PYTHONPATH
+ env.prepend_path('PYTHONPATH', join_path(pv_pydir,
+ 'vtkmodules'))
+ else:
+ env.prepend_path('PYTHONPATH', join_path(pv_pydir,
+ '_paraview.zip'))
+ env.prepend_path('PYTHONPATH', join_path(pv_pydir,
+ '_vtk.zip'))
def cmake_args(self):
"""Populate cmake arguments for ParaView."""