Commit 1100b52c authored by Douglas Gregor's avatar Douglas Gregor

ENH: Deal with 32-bit and 64-bit variants of Microsoft's MPI properly

parent d1281f5c
......@@ -216,13 +216,19 @@ else (MPI_COMPILE_CMDLINE)
"$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include"
)
# TODO: How do we know whether we're building 32-bit vs. 64-bit for MS-MPI?
# Decide between 32-bit and 64-bit libraries for Microsoft's MPI
if (CMAKE_CL_64)
set(MS_MPI_ARCH_DIR amd64)
else (CMAKE_CL_64)
set(MS_MPI_ARCH_DIR i386)
endif (CMAKE_CL_64)
find_library(MPI_LIBRARY
NAMES mpi mpich
NAMES mpi mpich msmpi
PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
"C:/Program Files/MPICH/SDK/Lib"
"$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
"$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/i386"
"$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}"
)
find_library(MPI_LIBRARY
NAMES mpich2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment