[Cmake-commits] CMake branch, next, updated. v2.8.1-1533-gf42285b

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f42285bcb9cb34146f239bc4d5928f538b421bac (commit)
       via  cea9389cc94e85d5d5fc705719147bc4ec7f92da (commit)
      from  0deb08d6d05fae2662c28fa8172c74f2ded3f712 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f42285bcb9cb34146f239bc4d5928f538b421bac
commit f42285bcb9cb34146f239bc4d5928f538b421bac
Merge: 0deb08d cea9389
Author: Brad King <brad.king at kitware.com>
Date:   Mon Jun 28 11:45:11 2010 -0400

    Merge branch 'FindMPI-BlueGene-L' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cea9389cc94e85d5d5fc705719147bc4ec7f92da
commit cea9389cc94e85d5d5fc705719147bc4ec7f92da
Author: Brad King <brad.king at kitware.com>
Date:   Mon Jun 28 11:42:34 2010 -0400

    FindMPI: Trust mpicc -showme on BlueGene/L
    
    Do not hard-code known BlueGene/L MPI libraries.  We do not know their
    location so the linker cannot find them without the proper -L search
    path.  The MPI compiler tells us about the libraries anyway, and if it
    does not then the user can fix the problem locally by editing the
    MPI_EXTRA_LIBRARY cache entry.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 481b0e9..ca9649a 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -332,12 +332,6 @@ else (MPI_COMPILE_CMDLINE)
   set(MPI_LINK_FLAGS "" CACHE STRING "MPI linking flags")
 endif (MPI_INCLUDE_PATH AND MPI_LIBRARY)
 
-# 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 ${MPI_EXTRA_LIBRARY} msglayer.rts devices.rts rts.rts devices.rts)
-   set(MPI_LIBRARY ${MPI_LIBRARY}  msglayer.rts devices.rts rts.rts devices.rts)
-endif("${MPI_LIBRARY}" MATCHES "mpich.rts")
-
 # Set up extra variables to conform to
 if (MPI_EXTRA_LIBRARY)
   set(MPI_LIBRARIES ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY})

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindMPI.cmake |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake