[Cmake-commits] CMake branch, next, updated. v3.1.0-1804-g5ae1335

[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  5ae13355efec27b1acb6e65bd411bb2c012fb952 (commit)
       via  eda08400439811a938f10bd7a9f662166e78dad6 (commit)
      from  6de9d59f46094043c358d0cc5aa5a7b532bbecf6 (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=5ae13355efec27b1acb6e65bd411bb2c012fb952
commit 5ae13355efec27b1acb6e65bd411bb2c012fb952
Merge: 6de9d59 eda0840
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 12 13:31:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 13:31:47 2015 -0500

    Merge topic 'safer-msmpi-checks' into next
    
    eda08400 FindMPI: drop local variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda08400439811a938f10bd7a9f662166e78dad6
commit eda08400439811a938f10bd7a9f662166e78dad6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 12 13:31:38 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jan 12 13:31:38 2015 -0500

    FindMPI: drop local variable

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 62272f8..545b077 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -177,6 +177,7 @@ if(WIN32)
   # MSMPI
   file(TO_CMAKE_PATH "$ENV{MSMPI_BIN}" msmpi_bin_path) # The default path ends with a '\' and doesn't mix with ';' when appending.
   list(APPEND _MPI_PREFIX_PATH "${msmpi_bin_path}")
+  unset(msmpi_bin_path)
   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

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

Summary of changes:
 Modules/FindMPI.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake