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

ParaView/VTK: Constrain version for ADIOS2 patch. (#28505)

Browse Source 
* ParaView/VTK: Constrain version for ADIOS2 patch.

Older available versions of ParaView/VTK predate
ADIODS2 support.

ParaView lower bound is 5.8 and VTK lower bound is 8.2.0

* ParaView: Gate the ADIOS2 by verison
This commit is contained in:
kwryankrattiger 2022-01-19 12:15:24 -06:00 committed by GitHub
parent 5e351ffff4
commit d5297b29be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,9 @@ class Paraview(CMakePackage, CudaPackage):
description='Builds a shared version of the library') description='Builds a shared version of the library')
variant('kits', default=True, variant('kits', default=True,
description='Use module kits') description='Use module kits')
variant('adios2', default=False, description='Enable ADIOS2 support') variant('adios2', default=False,
description='Enable ADIOS2 support',
when='@5.8:')
variant('advanced_debug', default=False, description="Enable all other debug flags beside build_type, such as VTK_DEBUG_LEAK") variant('advanced_debug', default=False, description="Enable all other debug flags beside build_type, such as VTK_DEBUG_LEAK")
variant('build_edition', default='canonical', multi=False, variant('build_edition', default='canonical', multi=False,
@ -205,7 +207,7 @@ class Paraview(CMakePackage, CudaPackage):
# Fix IOADIOS2 module to work with kits # Fix IOADIOS2 module to work with kits
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653
patch('vtk-adios2-module-no-kit.patch', when='@:5.10') patch('vtk-adios2-module-no-kit.patch', when='@5.8:5.10')
def url_for_version(self, version): def url_for_version(self, version):
_urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.{3}' _urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.{3}'

2
var/spack/repos/builtin/packages/vtk/package.py
View File

@ -79,7 +79,7 @@ class Vtk(CMakePackage):
# Fix IOADIOS2 module to work with kits # Fix IOADIOS2 module to work with kits
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653
patch('vtk-adios2-module-no-kit.patch', when='@:9.0.3') patch('vtk-adios2-module-no-kit.patch', when='@8.2.0:9.0.3')
# The use of the OpenGL2 backend requires at least OpenGL Core Profile # The use of the OpenGL2 backend requires at least OpenGL Core Profile
# version 3.2 or higher. # version 3.2 or higher.