[Cmake-commits] CMake branch, next, updated. v3.0.1-4852-gdcd9e96

[Brad King]

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  dcd9e9671e260bf7453bde45cf8205d9808640cb (commit)
       via  150c2125ddad4e5e6986dc168ccf3b35625f1cf5 (commit)
      from  9d9cc68308d7d08a3b3df35a2ad17430dd9f2ce9 (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=dcd9e9671e260bf7453bde45cf8205d9808640cb
commit dcd9e9671e260bf7453bde45cf8205d9808640cb
Merge: 9d9cc68 150c212
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 11 13:08:00 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 11 13:08:00 2014 -0400

    Merge topic 'FindMPI-mpiexec-MPI_HOME' into next
    
    150c2125 FindMPI: Honor MPI_HOME for MPIEXEC (#14347)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=150c2125ddad4e5e6986dc168ccf3b35625f1cf5
commit 150c2125ddad4e5e6986dc168ccf3b35625f1cf5
Author:     Marcel Loose <loose at astron.nl>
AuthorDate: Mon Aug 11 13:07:20 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 11 13:09:02 2014 -0400

    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.

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)
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindMPI.cmake |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake