[Cmake-commits] [cmake-commits] david.cole committed FindMPI.cmake 1.21 1.22

[cmake-commits at cmake.org]

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

Modified Files:
	FindMPI.cmake 
Log Message:
Add MPICH2 and Microsoft HPC paths, add paths to find mpiexec. Now it works better automatically on Windows. Thanks to Dave Partyka for developing the patch.


Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** FindMPI.cmake	18 Jul 2008 12:17:23 -0000	1.21
--- FindMPI.cmake	4 Sep 2009 22:02:05 -0000	1.22
***************
*** 59,64 ****
--- 59,70 ----
  mark_as_advanced(MPI_COMPILER)
  
+ file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles)
  find_program(MPIEXEC
    NAMES mpiexec mpirun lamexec
+   PATHS /usr/bin /usr/local/bin /usr/local/mpi/bin
+   "$ENV{SystemDrive}/Program Files/MPICH/SDK/Bin"
+   "${ProgramFiles}/MPICH2/Bin
+   "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Bin"
+   "$ENV{SystemDrive}/Program Files/Microsoft HPC Pack 2008 SDK/Bin"
    DOC "Executable for running MPI programs.")
  
***************
*** 248,256 ****
      /usr/include/mpi
      /usr/local/mpi/include
!     "C:/Program Files/MPICH/SDK/Include" 
!     "$ENV{SystemDrive}/Program Files/MPICH2/include"
      "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include"
      )
!   
    # Decide between 32-bit and 64-bit libraries for Microsoft's MPI
    if (CMAKE_CL_64)
--- 254,263 ----
      /usr/include/mpi
      /usr/local/mpi/include
!     "$ENV{SystemDrive}/Program Files/MPICH/SDK/Include" 
!     "${ProgramFiles}/MPICH2/include"
      "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include"
+     "$ENV{SystemDrive}/Program Files/Microsoft HPC Pack 2008 SDK/Include"
      )
! 
    # Decide between 32-bit and 64-bit libraries for Microsoft's MPI
    if (CMAKE_CL_64)
***************
*** 259,279 ****
      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 
      NAMES mpich2
      PATHS
!     "$ENV{SystemDrive}/Program Files/MPICH2/Lib")
  
    find_library(MPI_EXTRA_LIBRARY 
      NAMES mpi++
      PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
!     "C:/Program Files/MPICH/SDK/Lib" 
      DOC "Extra MPI libraries to link against.")
  
--- 266,287 ----
      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
      "$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
+     "${ProgramFiles}/MPICH2/Lib
      "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}"
+     "$ENV{SystemDrive}/Program Files/Microsoft HPC Pack 2008 SDK/Lib/${MS_MPI_ARCH_DIR}"
      )
!   find_library(MPI_LIBRARY
      NAMES mpich2
      PATHS
!     "${ProgramFiles}/MPICH2/Lib")
  
    find_library(MPI_EXTRA_LIBRARY 
      NAMES mpi++
      PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
!     "$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib" 
      DOC "Extra MPI libraries to link against.")