This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 265a5f4ec38c933cbb7212568ce5a3813e50e42d (commit) via 17a846ac3e8d0fab4bb99e238dbe867941594465 (commit) from 21d155f0cb279724c595f2ea8fcb0ceda6bce41d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=265a5f4ec38c933cbb7212568ce5a3813e50e42d commit 265a5f4ec38c933cbb7212568ce5a3813e50e42d Merge: 21d155f 17a846a Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu Dec 11 17:30:03 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Dec 11 17:30:03 2014 -0500 Merge topic 'find-msmpi' into next 17a846ac FindMPI: search for msmpi's mpiexec as well http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a846ac3e8d0fab4bb99e238dbe867941594465 commit 17a846ac3e8d0fab4bb99e238dbe867941594465 Author: Ben Boeckel <ben.boec...@kitware.com> AuthorDate: Thu Dec 11 17:26:06 2014 -0500 Commit: Ben Boeckel <ben.boec...@kitware.com> CommitDate: Thu Dec 11 17:26:06 2014 -0500 FindMPI: search for msmpi's mpiexec as well 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/") ----------------------------------------------------------------------- Summary of changes: Modules/FindMPI.cmake | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits