diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/vtk/find_fujitsu_mpi.patch | 18 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/vtk/package.py | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/vtk/find_fujitsu_mpi.patch b/var/spack/repos/builtin/packages/vtk/find_fujitsu_mpi.patch new file mode 100644 index 0000000000..c5ad2eb830 --- /dev/null +++ b/var/spack/repos/builtin/packages/vtk/find_fujitsu_mpi.patch @@ -0,0 +1,18 @@ +--- VTK-8.2.0/CMake/FindMPI.cmake.org 2020-06-11 14:50:51.000000000 +0900 ++++ VTK-8.2.0/CMake/FindMPI.cmake 2020-06-11 14:51:21.000000000 +0900 +@@ -99,12 +99,12 @@ + # + + # Start out with the generic MPI compiler names, as these are most commonly used. +-set(_MPI_C_COMPILER_NAMES mpicc mpcc mpicc_r mpcc_r) ++set(_MPI_C_COMPILER_NAMES mpicc mpcc mpicc_r mpcc_r, mpifcc) + set(_MPI_CXX_COMPILER_NAMES mpicxx mpiCC mpcxx mpCC mpic++ mpc++ +- mpicxx_r mpiCC_r mpcxx_r mpCC_r mpic++_r mpc++_r) ++ mpicxx_r mpiCC_r mpcxx_r mpCC_r mpic++_r mpc++_r, mpiFCC) + set(_MPI_Fortran_COMPILER_NAMES mpif95 mpif95_r mpf95 mpf95_r + mpif90 mpif90_r mpf90 mpf90_r +- mpif77 mpif77_r mpf77 mpf77_r) ++ mpif77 mpif77_r mpf77 mpf77_r, mpifrt) + + # GNU compiler names + set(_MPI_GNU_C_COMPILER_NAMES mpigcc mpgcc mpigcc_r mpgcc_r) diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index e99f779fed..0df4c4a5fc 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -103,6 +103,9 @@ class Vtk(CMakePackage): depends_on('double-conversion', when='@8.2.0:') depends_on('sqlite', when='@8.2.0:') + # For finding Fujitsu-MPI wrapper commands + patch('find_fujitsu_mpi.patch', when='%fj') + def url_for_version(self, version): url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz" return url.format(version.up_to(2), version) |