[Cmake-commits] CMake branch, next, updated. v3.1.0-1887-g94daeed

[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  94daeed95bbedf1bf341775eb1f0e0e1def12270 (commit)
       via  68857ccd823088caf240318f2a7b39522fc383da (commit)
      from  0965a0f01819c0e1d727ab1ee41fbd8123c7925b (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=94daeed95bbedf1bf341775eb1f0e0e1def12270
commit 94daeed95bbedf1bf341775eb1f0e0e1def12270
Merge: 0965a0f 68857cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 14 10:19:59 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 14 10:19:59 2015 -0500

    Merge topic 'safer-msmpi-checks' into next
    
    68857ccd FindMPI: handle trailing slash from $MSMPI_BIN


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68857ccd823088caf240318f2a7b39522fc383da
commit 68857ccd823088caf240318f2a7b39522fc383da
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 12 09:21:23 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 14 10:19:06 2015 -0500

    FindMPI: handle trailing slash from $MSMPI_BIN
    
    When installing, MSMPI puts a trailing backslash in the MSMPI_BIN
    environment variable. This causes trouble when concatenating in CMake
    since the list separator is now escaped and no longer a list separator
    due to the trailing backslash. Instead, use file(TO_CMAKE_PATH) to make
    the path CMake-friendly.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 9192054..545b077 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -175,7 +175,9 @@ 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}")
+  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:


hooks/post-receive
-- 
CMake