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

ParaView: add dependencies needed in paraview@master (#27745)

Browse Source 
* The proj and nlohmann-json packages are needed in paraview@master
* ParaView: bump master subdir version to 5.10
This commit is contained in:
Ethan Stam 2021-12-02 18:18:23 -07:00 committed by GitHub
parent b80b085575
commit 4c922ec572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,6 +173,14 @@ class Paraview(CMakePackage, CudaPackage):
# https://gitlab.kitware.com/paraview/paraview/-/merge_requests/4951
depends_on('cli11@1.9.1', when='@5.10:')
# ParaView depends on nlohmann-json due to changes in MR
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8550
depends_on('nlohmann-json', when='@master')
# ParaView depends on proj@8.1.0 due to changes in MR
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8474
depends_on('proj@8.1.0', when='@master')
patch('stl-reader-pv440.patch', when='@4.4.0')
# Broken gcc-detection - improved in 5.1.0, redundant later
@ -207,7 +215,7 @@ def url_for_version(self, version):
def paraview_subdir(self):
"""The paraview subdirectory name as paraview-major.minor"""
if self.spec.version == Version('master'):
return 'paraview-5.9'
return 'paraview-5.10'
else:
return 'paraview-{0}'.format(self.spec.version.up_to(2))