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

vtk: Add patch for finding Fujitsu-MPI wrapper commands. (#17069)

Browse Source
This commit is contained in:
Tomoki, Karatsu 2020-06-25 12:52:31 +09:00 committed by GitHub
parent cee24fbc98
commit b2a4af764c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
var/spack/repos/builtin/packages/vtk/find_fujitsu_mpi.patch Normal file
View File

@ -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)

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

@ -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)