[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-942-gd441c6e

[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  d441c6e9eede95b06c90465147bc6abffbbebc56 (commit)
       via  5d7653a0aba19f4793f9bec3b2b07d787bbf5624 (commit)
      from  fbfb15030c1e5fc1bb472b61b8b0e73c0265da0a (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=d441c6e9eede95b06c90465147bc6abffbbebc56
commit d441c6e9eede95b06c90465147bc6abffbbebc56
Merge: fbfb150 5d7653a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 9 11:01:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 9 11:01:05 2015 -0400

    Merge topic 'FindMPI-Intel-5' into next
    
    5d7653a0 FindMPI: Extend Intel-MPI 5+ workaround for recent GCCs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d7653a0aba19f4793f9bec3b2b07d787bbf5624
commit 5d7653a0aba19f4793f9bec3b2b07d787bbf5624
Author:     Sean Brennan <brennan at lanl.gov>
AuthorDate: Thu Jul 9 08:34:19 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 9 11:00:44 2015 -0400

    FindMPI: Extend Intel-MPI 5+ workaround for recent GCCs
    
    Extend the workaround added by commit v3.2.0-rc1~278^2 (FindMPI:
    Workaround Intel MPI 5.0.1 exit code problem, 2014-12-04) with an
    additional/alternate keyword to recognize the case with recent GCCs.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 545b077..039f109 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -204,7 +204,7 @@ function (_mpi_check_compiler compiler options cmdvar resvar)
   # Intel MPI 5.0.1 will return a zero return code even when the
   # argument to the MPI compiler wrapper is unknown.  Attempt to
   # catch this case.
-  if("${cmdline}" MATCHES "undefined reference")
+  if("${cmdline}" MATCHES "undefined reference" OR "${cmdline}" MATCHES "unrecognized")
     set(success 255 )
   endif()
   set(${cmdvar} "${cmdline}" PARENT_SCOPE)

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

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


hooks/post-receive
-- 
CMake