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

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

This commit is contained in:
Douglas Gregor 2008-04-10 16:54:20 -04:00
parent d1281f5cbc
commit 1100b52c7e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindMPI.cmake
View File

@ -216,13 +216,19 @@ else (MPI_COMPILE_CMDLINE)
"$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include" "$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 find_library(MPI_LIBRARY
NAMES mpi mpich NAMES mpi mpich msmpi
PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
"C:/Program Files/MPICH/SDK/Lib" "C:/Program Files/MPICH/SDK/Lib"
"$ENV{SystemDrive}/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 find_library(MPI_LIBRARY
NAMES mpich2 NAMES mpich2