summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-12 16:16:06 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-12-12 16:16:06 (GMT)
commit3cc84d18d428934076baa16e1dddf6d414f09622 (patch)
tree8d51d0a7ad2a58b98f1e6db45e8273fcaa7c225e /Modules
parent9f41c45f4325271a24c96e17853aadac3a081fe8 (diff)
parent17a846ac3e8d0fab4bb99e238dbe867941594465 (diff)
downloadCMake-3cc84d18d428934076baa16e1dddf6d414f09622.zip
CMake-3cc84d18d428934076baa16e1dddf6d414f09622.tar.gz
CMake-3cc84d18d428934076baa16e1dddf6d414f09622.tar.bz2
Merge topic 'find-msmpi'
17a846ac FindMPI: search for msmpi's mpiexec as well
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindMPI.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 6f6dcf3..0508579 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -174,6 +174,7 @@ set(_MPI_EXEC_NAMES mpiexec mpirun lamexec srun)
# Grab the path to MPI from the registry if we're on windows.
set(_MPI_PREFIX_PATH)
if(WIN32)
+ list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]/Bin")
list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH2;Path]")
list(APPEND _MPI_PREFIX_PATH "$ENV{ProgramW6432}/MPICH2/")