diff options
| author | Marcel Loose <loose@astron.nl> | 2014-08-11 17:07:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-08-11 17:09:02 (GMT) |
| commit | 150c2125ddad4e5e6986dc168ccf3b35625f1cf5 (patch) | |
| tree | f79a2485db870eaa9e661ca27d6aaf49814d4a52 | |
| parent | ffc1935a73267cfe74e5d5492c9621ccf6c66112 (diff) | |
| download | CMake-150c2125ddad4e5e6986dc168ccf3b35625f1cf5.zip CMake-150c2125ddad4e5e6986dc168ccf3b35625f1cf5.tar.gz CMake-150c2125ddad4e5e6986dc168ccf3b35625f1cf5.tar.bz2 | |
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.
| -rw-r--r-- | Modules/FindMPI.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 6e15f3b..3be5e3c 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -522,6 +522,7 @@ endfunction() # Most mpi distros have some form of mpiexec which gives us something we can reliably look for. find_program(MPIEXEC NAMES ${_MPI_EXEC_NAMES} + HINTS ${MPI_HOME} $ENV{MPI_HOME} PATHS ${_MPI_PREFIX_PATH} PATH_SUFFIXES bin DOC "Executable for running MPI programs.") @@ -584,7 +585,9 @@ foreach (lang C CXX Fortran) find_program(MPI_${lang}_COMPILER 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}) mark_as_advanced(MPI_${lang}_COMPILER) |