diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2022-01-19 12:15:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 13:15:24 -0500 |
| commit | d5297b29be46d2daa9389c6019b2b06539e5322b (patch) | |
| tree | d6d1673980e8c14d6b5a651d2ef86d9cecf023ec | |
| parent | 5e351ffff42cf204daada2bd6d512ca1b2b4498c (diff) | |
| download | spack-d5297b29be46d2daa9389c6019b2b06539e5322b.tar.gz spack-d5297b29be46d2daa9389c6019b2b06539e5322b.tar.bz2 spack-d5297b29be46d2daa9389c6019b2b06539e5322b.tar.xz spack-d5297b29be46d2daa9389c6019b2b06539e5322b.zip | |
ParaView/VTK: Constrain version for ADIOS2 patch. (#28505)
* 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
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/vtk/package.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 4861268163..45c1d190f1 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -60,7 +60,9 @@ class Paraview(CMakePackage, CudaPackage): description='Builds a shared version of the library') variant('kits', default=True, 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('build_edition', default='canonical', multi=False, @@ -205,7 +207,7 @@ class Paraview(CMakePackage, CudaPackage): # Fix IOADIOS2 module to work with kits # 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): _urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.{3}' diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 0ba1280bd7..024bd26950 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -79,7 +79,7 @@ class Vtk(CMakePackage): # Fix IOADIOS2 module to work with kits # 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 # version 3.2 or higher. |