[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1132-g515f233

[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  515f2331dc203f56b4c4e7eb2703298ba1116a7d (commit)
       via  a0792c48513fd76d8eb00a52f551f0f6fe1b71dc (commit)
      from  97f3bfd8b9d9b4cb9ef1d85086883b498e6fc21e (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=515f2331dc203f56b4c4e7eb2703298ba1116a7d
commit 515f2331dc203f56b4c4e7eb2703298ba1116a7d
Merge: 97f3bfd a0792c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 12 09:53:59 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 12 09:53:59 2014 -0500

    Merge topic 'FindMPI-parse-Xlinker-flags' into next
    
    a0792c48 FindMPI: Extract -Xlinker options


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0792c48513fd76d8eb00a52f551f0f6fe1b71dc
commit a0792c48513fd76d8eb00a52f551f0f6fe1b71dc
Author:     Alin Marin Elena <alinm.elena at gmail.com>
AuthorDate: Tue Dec 9 10:52:33 2014 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 12 09:53:43 2014 -0500

    FindMPI: Extract -Xlinker options
    
    Extend the regex that mathces -Wl, linker options to match -Xlinker too.
    These are used by Intel MPI and perhaps others.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 6f6dcf3..56fffc7 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -363,7 +363,7 @@ function (interrogate_mpi_compiler lang try_libs)
         endif()
 
         # Extract linker flags from the link command line
-        string(REGEX MATCHALL "(^| )-Wl,([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
+        string(REGEX MATCHALL "(^| )(-Wl,|-Xlinker )([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
         set(MPI_LINK_FLAGS_WORK)
         foreach(FLAG ${MPI_ALL_LINK_FLAGS})
           if (MPI_LINK_FLAGS_WORK)

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

Summary of changes:
 Modules/FindMPI.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake