From 1100b52c7e3cb37f6689a149d0a122e4f1fe18b4 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <doug.gregor@gmail.com>
Date: Thu, 10 Apr 2008 16:54:20 -0400
Subject: [PATCH] ENH: Deal with 32-bit and 64-bit variants of Microsoft's MPI
 properly

---
 Modules/FindMPI.cmake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 5e218e707..0923c00b8 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -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