[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-978-gb394b8b

[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  b394b8b7fca4095acb538cf4d1db89caf8c35bea (commit)
       via  cfd23d3f1ff2fbbaa187928348d49fb463607b42 (commit)
      from  9561cf0e324c1b1dbd6eb57ff46a2763094023d2 (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=b394b8b7fca4095acb538cf4d1db89caf8c35bea
commit b394b8b7fca4095acb538cf4d1db89caf8c35bea
Merge: 9561cf0 cfd23d3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 10 08:55:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 10 08:55:45 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfd23d3f1ff2fbbaa187928348d49fb463607b42
commit cfd23d3f1ff2fbbaa187928348d49fb463607b42
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: Fri Jul 10 08:55:39 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..06ecfaa 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:


hooks/post-receive
-- 
CMake