[Cmake-commits] CMake branch, next, updated. v3.1.0-1796-gfbecece

[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  fbecece01a35c39504d190af3976b2e861745862 (commit)
       via  1cc5d81139a9ee92dfbea04eb91cad9abcbe622c (commit)
      from  3bc2cacc230c3270883eb05d7398f27036ef33ac (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=fbecece01a35c39504d190af3976b2e861745862
commit fbecece01a35c39504d190af3976b2e861745862
Merge: 3bc2cac 1cc5d81
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 12 10:52:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 10:52:49 2015 -0500

    Merge topic 'safer-msmpi-checks' into next
    
    1cc5d811 FindMPI: use file(TO_CMAKE_PATH) to remove '\'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cc5d81139a9ee92dfbea04eb91cad9abcbe622c
commit 1cc5d81139a9ee92dfbea04eb91cad9abcbe622c
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 12 10:52:27 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jan 12 10:52:27 2015 -0500

    FindMPI: use file(TO_CMAKE_PATH) to remove '\'

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 13b9bdf..62272f8 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -175,7 +175,8 @@ set(_MPI_EXEC_NAMES                        mpiexec mpirun lamexec srun)
 set(_MPI_PREFIX_PATH)
 if(WIN32)
   # MSMPI
-  list(APPEND _MPI_PREFIX_PATH "$ENV{MSMPI_BIN}/")
+  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}")
   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 |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake