zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ParaView: correct path for PARAVIEW_VTK_DIR (#19770)

Browse Source 
* ParaView: correct path for PARAVIEW_VTK_DIR

* Update formatting
This commit is contained in:
Ethan Stam
2020-11-09 12:02:00 -07:00
committed by GitHub
parent 4092c90b57
commit e73e7cf0ad
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
var/spack/repos/builtin/packages/paraview/package.py
View File

@@ -157,7 +157,10 @@ def url_for_version(self, version):
@property
def paraview_subdir(self):
"""The paraview subdirectory name as paraview-major.minor"""
return 'paraview-{0}'.format(self.spec.version.up_to(2))
if self.spec.version == Version('develop'):
return 'paraview-5.9'
else:
return 'paraview-{0}'.format(self.spec.version.up_to(2))
def setup_dependent_build_environment(self, env, dependent_spec):
if os.path.isdir(self.prefix.lib64):
@@ -165,8 +168,13 @@ def setup_dependent_build_environment(self, env, dependent_spec):
else:
lib_dir = self.prefix.lib
env.set('ParaView_DIR', self.prefix)
env.set('PARAVIEW_VTK_DIR',
join_path(lib_dir, 'cmake', self.paraview_subdir))
if self.spec.version <= Version('5.7.0'):
env.set('PARAVIEW_VTK_DIR',
join_path(lib_dir, 'cmake', self.paraview_subdir))
else:
env.set('PARAVIEW_VTK_DIR',
join_path(lib_dir, 'cmake', self.paraview_subdir, 'vtk'))
def setup_run_environment(self, env):
# paraview 5.5 and later
@@ -179,8 +187,13 @@ def setup_run_environment(self, env):
lib_dir = self.prefix.lib
env.set('ParaView_DIR', self.prefix)
env.set('PARAVIEW_VTK_DIR',
join_path(lib_dir, 'cmake', self.paraview_subdir))
if self.spec.version <= Version('5.7.0'):
env.set('PARAVIEW_VTK_DIR',
join_path(lib_dir, 'cmake', self.paraview_subdir))
else:
env.set('PARAVIEW_VTK_DIR',
join_path(lib_dir, 'cmake', self.paraview_subdir, 'vtk'))
if self.spec.version <= Version('5.4.1'):
lib_dir = join_path(lib_dir, self.paraview_subdir)