[cmake-commits] alex committed CMakeLists.txt 1.12 1.13 FindMPI.cmake 1.12 1.13

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt FindMPI.cmake 
Log Message:

ENH: add support for BlueGene/L

Alex



Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- FindMPI.cmake	30 Apr 2007 21:03:53 -0000	1.12
+++ FindMPI.cmake	22 Jun 2007 14:22:27 -0000	1.13
@@ -13,7 +13,7 @@
 )
 
 FIND_LIBRARY(MPI_LIBRARY 
-             NAMES mpich2 mpi mpich 
+             NAMES mpich2 mpi mpich mpich.rts
              PATH_SUFFIXES mpi/lib
              PATHS
              "$ENV{ProgramFiles}/MPICH/SDK/Lib"
@@ -29,4 +29,9 @@
              "C:/Program Files/MPICH/SDK/Lib" 
              DOC "If a second mpi library is necessary, specify it here.")
 
+# on BlueGene/L the MPI lib is named libmpich.rts.a, there also these additional libs are required
+IF("${MPI_LIBRARY}" MATCHES "mpich.rts")
+   SET(MPI_EXTRA_LIBRARY msglayer.rts devices.rts rts.rts devices.rts CACHE STRING "Additional MPI libs" FORCE)
+ENDIF("${MPI_LIBRARY}" MATCHES "mpich.rts")
+
 MARK_AS_ADVANCED(MPI_INCLUDE_PATH MPI_LIBRARY MPI_EXTRA_LIBRARY)

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeLists.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CMakeLists.txt	25 May 2007 19:22:22 -0000	1.12
+++ CMakeLists.txt	22 Jun 2007 14:22:27 -0000	1.13
@@ -1,5 +1,5 @@
 # just install the modules
-# new file added, force rerunning cmake 
+# new file added, force rerunning cmake #
 
 SUBDIRS(Platform)
 INSTALL_FILES(${CMAKE_DATA_DIR}/Modules .*\\.cmake$)