[Cmake-commits] [cmake-commits] dgregor committed FindMPI.cmake 1.17 1.18

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv4468

Modified Files:
	FindMPI.cmake 
Log Message:
ENH: Deal with 32-bit and 64-bit variants of Microsoft's MPI properly


Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** FindMPI.cmake	31 Mar 2008 14:55:32 -0000	1.17
--- FindMPI.cmake	10 Apr 2008 20:54:20 -0000	1.18
***************
*** 217,227 ****
      )
    
!   # TODO: How do we know whether we're building 32-bit vs. 64-bit for MS-MPI?
    find_library(MPI_LIBRARY 
!     NAMES mpi mpich
      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"
      )
    find_library(MPI_LIBRARY 
--- 217,233 ----
      )
    
!   # 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 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/${MS_MPI_ARCH_DIR}"
      )
    find_library(MPI_LIBRARY