kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'safer-msmpi-checks' 

68857ccd FindMPI: handle trailing slash from $MSMPI_BIN
This commit is contained in:
Brad King 2015-01-15 09:54:10 -05:00 committed by CMake Topic Stage
parent b4263abdea 68857ccd82
commit ff1727af77
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindMPI.cmake
View File

@ -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