[Cmake-commits] CMake branch, next, updated. v3.1.0-1506-g007b045

[Ben Boeckel]

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  007b0452b5f7e536f1f88b30bcc5331227cbb098 (commit)
       via  ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d (commit)
       via  827243942c3568bbb621c4009c8f03fdd0ba71f7 (commit)
       via  73144c098d8b176bb99b762450b9b231687011b8 (commit)
      from  be2007b08096c2ca1323141d07811f8018151e24 (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=007b0452b5f7e536f1f88b30bcc5331227cbb098
commit 007b0452b5f7e536f1f88b30bcc5331227cbb098
Merge: be2007b ab4d1d0
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Jan 6 12:59:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 6 12:59:40 2015 -0500

    Merge topic 'find-msmpi' into next
    
    ab4d1d07 FindMPI: MSMPI changed the subdirectories it uses
    82724394 FindMPI: add more search paths for MSMPI
    73144c09 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d
commit ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Jan 6 12:58:31 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Jan 6 12:59:07 2015 -0500

    FindMPI: MSMPI changed the subdirectories it uses

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 672c65d..9192054 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -426,16 +426,18 @@ function (interrogate_mpi_compiler lang try_libs)
 
       # Decide between 32-bit and 64-bit libraries for Microsoft's MPI
       if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
-        set(MS_MPI_ARCH_DIR amd64)
+        set(MS_MPI_ARCH_DIR x64)
+        set(MS_MPI_ARCH_DIR2 amd64)
       else()
-        set(MS_MPI_ARCH_DIR i386)
+        set(MS_MPI_ARCH_DIR x86)
+        set(MS_MPI_ARCH_DIR2 i386)
       endif()
 
       set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
       find_library(MPI_LIB
         NAMES         mpi mpich mpich2 msmpi
         HINTS         ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
-        PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR})
+        PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR} Lib/${MS_MPI_ARCH_DIR2})
       set(MPI_LIBRARIES_WORK ${MPI_LIB})
 
       # Right now, we only know about the extra libs for C++.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=827243942c3568bbb621c4009c8f03fdd0ba71f7
commit 827243942c3568bbb621c4009c8f03fdd0ba71f7
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Jan 6 12:58:07 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Jan 6 12:58:07 2015 -0500

    FindMPI: add more search paths for MSMPI
    
    Also comment what the various search paths are for.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 8e39a7f..672c65d 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -174,7 +174,11 @@ 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)
+  # MSMPI
+  list(APPEND _MPI_PREFIX_PATH "$ENV{MSMPI_BIN}")
   list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MPI;InstallRoot]/Bin")
+  list(APPEND _MPI_PREFIX_PATH "$ENV{MSMPI_INC}/..") # The SDK is installed separately from the runtime
+  # MPICH
   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     |   12 +++++++++---
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake