paraview: set PARAVIEW_VTK_DIR in spack_env and run_env (#8308)

This commit is contained in:
Daryl W. Grunau 2018-05-30 09:35:39 -06:00 committed by Adam J. Stewart
parent 8eb0f50219
commit 97206cb60a

View file

@ -96,6 +96,15 @@ def url_for_version(self, version):
else: else:
return self._urlfmt.format(version.up_to(2), version, '') return self._urlfmt.format(version.up_to(2), version, '')
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
if os.path.isdir(self.prefix.lib64):
lib_dir = self.prefix.lib64
else:
lib_dir = self.prefix.lib
paraview_version = 'paraview-%s' % self.spec.version.up_to(2)
spack_env.set('PARAVIEW_VTK_DIR',
join_path(lib_dir, 'cmake', paraview_version))
def setup_environment(self, spack_env, run_env): def setup_environment(self, spack_env, run_env):
if os.path.isdir(self.prefix.lib64): if os.path.isdir(self.prefix.lib64):
lib_dir = self.prefix.lib64 lib_dir = self.prefix.lib64
@ -106,6 +115,8 @@ def setup_environment(self, spack_env, run_env):
paraview_version)) paraview_version))
run_env.prepend_path('LD_LIBRARY_PATH', join_path(lib_dir, run_env.prepend_path('LD_LIBRARY_PATH', join_path(lib_dir,
paraview_version)) paraview_version))
run_env.set('PARAVIEW_VTK_DIR',
join_path(lib_dir, 'cmake', paraview_version))
if '+python' in self.spec: if '+python' in self.spec:
run_env.prepend_path('PYTHONPATH', join_path(lib_dir, run_env.prepend_path('PYTHONPATH', join_path(lib_dir,
paraview_version)) paraview_version))