diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-15 14:54:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-15 14:54:10 (GMT) |
| commit | ff1727af778301c2a53007098bd31fe7b9af6c40 (patch) | |
| tree | e9c1354d07e09d9ea8de5987423b1c29c7a7f05a /Modules | |
| parent | b4263abdea04bf445c3e99be3be627dfb6c3047d (diff) | |
| parent | 68857ccd823088caf240318f2a7b39522fc383da (diff) | |
| download | CMake-ff1727af778301c2a53007098bd31fe7b9af6c40.zip CMake-ff1727af778301c2a53007098bd31fe7b9af6c40.tar.gz CMake-ff1727af778301c2a53007098bd31fe7b9af6c40.tar.bz2 | |
Merge topic 'safer-msmpi-checks'
68857ccd FindMPI: handle trailing slash from $MSMPI_BIN
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindMPI.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
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 |