[Cmake-commits] CMake branch, next, updated. v2.8.2-144-g16456ba

[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  16456ba43791c8dad9dace543f1eb17d2c3e9750 (commit)
       via  96c7cb26e95e912e75614141eecb6472fc6e7948 (commit)
       via  8460059a72312f142c43439a1eab5610c6d85dbe (commit)
      from  582d3abd16a38a6d89ca02f2aaa7bf96ca522962 (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=16456ba43791c8dad9dace543f1eb17d2c3e9750
commit 16456ba43791c8dad9dace543f1eb17d2c3e9750
Merge: 582d3ab 96c7cb2
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 11:03:34 2010 -0400

    Merge branch 'FindMPI-flag-parsing' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96c7cb26e95e912e75614141eecb6472fc6e7948
commit 96c7cb26e95e912e75614141eecb6472fc6e7948
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 10:59:52 2010 -0400

    FindMPI: Fix parsing of mpicc -Wl,-L link flags (#9093)
    
    Commit d84cbd0f (FindMPI: Parse mpicc flags more carefully, 2010-06-24)
    broke parsing of '-L' flags appearing after '-Wl,' by expecting a
    preceding space.  Update the regular expression to allow '-Wl,-L' too.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 6139d4d..250ae57 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -230,10 +230,10 @@ elseif (MPI_COMPILE_CMDLINE)
   endif (NOT MPI_INCLUDE_PATH_WORK)
 
   # Extract linker paths from the link command line
-  string(REGEX MATCHALL "(^| )-L([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}")
+  string(REGEX MATCHALL "(^| |-Wl,)-L([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}")
   set(MPI_LINK_PATH)
   foreach(LPATH ${MPI_ALL_LINK_PATHS})
-    string(REGEX REPLACE "^ ?-L" "" LPATH ${LPATH})
+    string(REGEX REPLACE "^(| |-Wl,)-L" "" LPATH ${LPATH})
     string(REGEX REPLACE "//" "/" LPATH ${LPATH})
     list(APPEND MPI_LINK_PATH ${LPATH})
   endforeach(LPATH)

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

    FindMPI: Failure is not an error if not REQUIRED

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 9e2a3ad..6139d4d 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -274,9 +274,9 @@ elseif (MPI_COMPILE_CMDLINE)
     find_library(MPI_LIB ${LIB} HINTS ${MPI_LINK_PATH})
     if (MPI_LIB)
       list(APPEND MPI_LIBRARIES ${MPI_LIB})
-    else (MPI_LIB)
-      message(SEND_ERROR "Unable to find MPI library ${LIB}")
-    endif (MPI_LIB)
+    elseif (NOT MPI_FIND_QUIETLY)
+      message(WARNING "Unable to find MPI library ${LIB}")
+    endif ()
   endforeach(LIB)
   set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE INTERNAL "Scratch variable for MPI detection" FORCE)
 

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

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


hooks/post-receive
-- 
CMake