From 50f96e15de585c653dc7d5e5cf06a05bba364bbc Mon Sep 17 00:00:00 2001
From: "Tomoki, Karatsu" <49965247+t-karatsu@users.noreply.github.com>
Date: Fri, 31 Jul 2020 12:05:20 +0900
Subject: [PATCH] vtk: Support for new option to enable MPI. (#17727)
---
var/spack/repos/builtin/packages/vtk/package.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py
index 2a334cb1fb..ef6c6570c2 100644
--- a/var/spack/repos/builtin/packages/vtk/package.py
+++ b/var/spack/repos/builtin/packages/vtk/package.py
@@ -104,7 +104,7 @@ class Vtk(CMakePackage):
depends_on('sqlite', when='@8.2.0:')
# For finding Fujitsu-MPI wrapper commands
- patch('find_fujitsu_mpi.patch', when='%fj')
+ patch('find_fujitsu_mpi.patch', when='@:8.2.0%fj')
def url_for_version(self, version):
url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz"
@@ -159,10 +159,15 @@ def cmake_args(self):
])
if '+mpi' in spec:
- cmake_args.extend([
- '-DVTK_Group_MPI:BOOL=ON',
- '-DVTK_USE_SYSTEM_DIY2:BOOL=OFF',
- ])
+ if spec.satisfies('@:8.2.0'):
+ cmake_args.extend([
+ '-DVTK_Group_MPI:BOOL=ON',
+ '-DVTK_USE_SYSTEM_DIY2:BOOL=OFF'
+ ])
+ else:
+ cmake_args.extend([
+ '-DVTK_USE_MPI=ON'
+ ])
if '+ffmpeg' in spec:
cmake_args.extend(['-DModule_vtkIOFFMPEG:BOOL=ON'])
--
GitLab