summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-08-18 15:21:40 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-08-18 15:21:40 (GMT)
commit258c5c2f27886ca60bda5a6a1f6411310f0bf1df (patch)
tree161228307a979558e5080b6180ecd96ea393cb8b
parent24f46959a2f4d00f65fab56e3cbea09d16b7381e (diff)
parent150c2125ddad4e5e6986dc168ccf3b35625f1cf5 (diff)
downloadCMake-258c5c2f27886ca60bda5a6a1f6411310f0bf1df.zip
CMake-258c5c2f27886ca60bda5a6a1f6411310f0bf1df.tar.gz
CMake-258c5c2f27886ca60bda5a6a1f6411310f0bf1df.tar.bz2
Merge topic 'FindMPI-mpiexec-MPI_HOME'
150c2125 FindMPI: Honor MPI_HOME for MPIEXEC (#14347)
-rw-r--r--Modules/FindMPI.cmake5
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)