[Cmake-commits] CMake branch, next, updated. v3.1.0-1780-g1839501

Ben Boeckel ben.boeckel at kitware.com
Mon Jan 12 09:23:36 EST 2015


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  183950101b44830bd458201dae0e9c2c7762ed39 (commit)
       via  bba9705e96ec3f97a25a4f7029f79150785e2003 (commit)
      from  214d354dcb9a170500a17c2213e4dde7f903ec1d (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=183950101b44830bd458201dae0e9c2c7762ed39
commit 183950101b44830bd458201dae0e9c2c7762ed39
Merge: 214d354 bba9705
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 12 09:23:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 09:23:35 2015 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bba9705e96ec3f97a25a4f7029f79150785e2003
commit bba9705e96ec3f97a25a4f7029f79150785e2003
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 12 09:21:23 2015 -0500
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jan 12 09:23:23 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, add in a dummy forward slash
    which doesn't change the path, but uses up the backslash.

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

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list