FindMPI: Honor MPI_HOME for MPIEXEC (#14347)

We already use MPI_HOME and ENV{MPI_HOME} as hints for the location
of the MPI compilers.  Do the same for mpiexec, and then use the
location of mpiexec as a hint to find the compilers.
This commit is contained in:
Marcel Loose 2014-08-11 13:07:20 -04:00 committed by Brad King
parent ffc1935a73
commit 150c2125dd
1 changed files with 4 additions and 1 deletions

View File

@ -522,6 +522,7 @@ endfunction()
# Most mpi distros have some form of mpiexec which gives us something we can reliably look for. # Most mpi distros have some form of mpiexec which gives us something we can reliably look for.
find_program(MPIEXEC find_program(MPIEXEC
NAMES ${_MPI_EXEC_NAMES} NAMES ${_MPI_EXEC_NAMES}
HINTS ${MPI_HOME} $ENV{MPI_HOME}
PATHS ${_MPI_PREFIX_PATH} PATHS ${_MPI_PREFIX_PATH}
PATH_SUFFIXES bin PATH_SUFFIXES bin
DOC "Executable for running MPI programs.") DOC "Executable for running MPI programs.")
@ -584,7 +585,9 @@ foreach (lang C CXX Fortran)
find_program(MPI_${lang}_COMPILER find_program(MPI_${lang}_COMPILER
NAMES ${_MPI_${lang}_COMPILER_NAMES} NAMES ${_MPI_${lang}_COMPILER_NAMES}
PATHS "${MPI_HOME}/bin" "$ENV{MPI_HOME}/bin" ${_MPI_PREFIX_PATH}) HINTS ${_MPI_BASE_DIR}/bin
PATHS ${_MPI_PREFIX_PATH}
)
interrogate_mpi_compiler(${lang} ${try_libs}) interrogate_mpi_compiler(${lang} ${try_libs})
mark_as_advanced(MPI_${lang}_COMPILER) mark_as_advanced(MPI_${lang}_COMPILER)