--- FindMPI.cmake.orig	2014-12-04 18:34:52.000000000 +0000
+++ FindMPI.cmake	2014-12-04 18:37:03.000000000 +0000
@@ -207,6 +207,23 @@ endforeach()
 # ignores language-specific flags and libraries.  However, some MPI implementations
 # (Windows implementations) do not have compiler wrappers, so this approach must be used.
 #
+function (check_mpi_compiler lang options cmdline result)
+      execute_process(
+        COMMAND ${lang} ${options}
+        OUTPUT_VARIABLE  cline OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_VARIABLE   cline ERROR_STRIP_TRAILING_WHITESPACE
+        RESULT_VARIABLE  success)
+       # Intel MPI will return a zero return code even when the
+       # argument to the MPI compiler wrapper is unknown.  Attempt to
+       # catch this case.
+       #message(STATUS "try lang: ${lang} ${options}")
+       if( "${cline}" MATCHES "undefined reference" )
+         set(success 255 )
+       endif()
+       set(${cmdline} ${cline} PARENT_SCOPE)
+       set(${result}  ${success} PARENT_SCOPE)
+endfunction()
+
 function (interrogate_mpi_compiler lang try_libs)
   # MPI_${lang}_NO_INTERROGATE will be set to a compiler name when the *regular* compiler was
   # discovered to be the MPI compiler.  This happens on machines like the Cray XE6 that use
@@ -220,12 +237,7 @@ function (interrogate_mpi_compiler lang
     if (MPI_${lang}_COMPILER)
       # Check whether the -showme:compile option works. This indicates that we have either OpenMPI
       # or a newer version of LAM-MPI, and implies that -showme:link will also work.
-      execute_process(
-        COMMAND ${MPI_${lang}_COMPILER} -showme:compile
-        OUTPUT_VARIABLE  MPI_COMPILE_CMDLINE OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_VARIABLE   MPI_COMPILE_CMDLINE ERROR_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE  MPI_COMPILER_RETURN)
-
+      check_mpi_compiler( ${MPI_${lang}_COMPILER} "-showme:compile" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
       if (MPI_COMPILER_RETURN EQUAL 0)
         # If we appear to have -showme:compile, then we should
         # also have -showme:link. Try it.
@@ -257,20 +269,12 @@ function (interrogate_mpi_compiler lang
 
       # Older versions of LAM-MPI have "-showme". Try to find that.
       if (NOT MPI_COMPILER_RETURN EQUAL 0)
-        execute_process(
-          COMMAND ${MPI_${lang}_COMPILER} -showme
-          OUTPUT_VARIABLE  MPI_COMPILE_CMDLINE OUTPUT_STRIP_TRAILING_WHITESPACE
-          ERROR_VARIABLE   MPI_COMPILE_CMDLINE ERROR_STRIP_TRAILING_WHITESPACE
-          RESULT_VARIABLE  MPI_COMPILER_RETURN)
+        check_mpi_compiler( ${MPI_${lang}_COMPILER} -showme MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
       endif()
 
       # MVAPICH uses -compile-info and -link-info.  Try them.
       if (NOT MPI_COMPILER_RETURN EQUAL 0)
-        execute_process(
-          COMMAND ${MPI_${lang}_COMPILER} -compile-info
-          OUTPUT_VARIABLE  MPI_COMPILE_CMDLINE OUTPUT_STRIP_TRAILING_WHITESPACE
-          ERROR_VARIABLE   MPI_COMPILE_CMDLINE ERROR_STRIP_TRAILING_WHITESPACE
-          RESULT_VARIABLE  MPI_COMPILER_RETURN)
+        check_mpi_compiler( ${MPI_${lang}_COMPILER} -compile-info MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
 
         # If we have compile-info, also have link-info.
         if (MPI_COMPILER_RETURN EQUAL 0)
@@ -290,11 +294,7 @@ function (interrogate_mpi_compiler lang
 
       # MPICH just uses "-show". Try it.
       if (NOT MPI_COMPILER_RETURN EQUAL 0)
-        execute_process(
-          COMMAND ${MPI_${lang}_COMPILER} -show
-          OUTPUT_VARIABLE  MPI_COMPILE_CMDLINE OUTPUT_STRIP_TRAILING_WHITESPACE
-          ERROR_VARIABLE   MPI_COMPILE_CMDLINE ERROR_STRIP_TRAILING_WHITESPACE
-          RESULT_VARIABLE  MPI_COMPILER_RETURN)
+        check_mpi_compiler( ${MPI_${lang}_COMPILER} -show MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
       endif()
 
       if (MPI_COMPILER_RETURN EQUAL 0)

--- FindMPI.cmake.orig2	2014-12-04 18:52:59.000000000 +0000
+++ FindMPI.cmake	2014-12-04 18:56:02.000000000 +0000
@@ -569,6 +569,13 @@ endforeach()
 # This loop finds the compilers and sends them off for interrogation.
 foreach (lang C CXX Fortran)
   if (CMAKE_${lang}_COMPILER_WORKS)
+    # first ditch try -- if nothing works so far, just try running the regular compiler and
+    # see if we can create an MPI executable.
+    set(regular_compiler_worked 0)
+    if (NOT MPI_${lang}_LIBRARIES OR NOT MPI_${lang}_INCLUDE_PATH)
+      try_regular_compiler(${lang} regular_compiler_worked)
+      message(STATUS "supplied compiler is a MPI wrapper....")
+    endif()
     # If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler.
     if (MPI_${lang}_COMPILER)
       is_file_executable(MPI_${lang}_COMPILER MPI_COMPILER_IS_EXECUTABLE)

From f5ede30006f61ef5bb78d6602ebd9083cd7f9869 Mon Sep 17 00:00:00 2001
Message-Id: <f5ede30006f61ef5bb78d6602ebd9083cd7f9869.1417720607.git.brad.king@kitware.com>
From: Alin Marin Elena <alinm.elena@gmail.com>
Date: Thu, 4 Dec 2014 13:51:00 -0500
Subject: [PATCH 1/2] FindMPI: Factor out compiler wrapper execution into
 helper

---
 Modules/FindMPI.cmake | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index ba4ea5b..e135edb 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -188,6 +188,15 @@ foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH})
   endforeach()
 endforeach()
 
+function (_mpi_check_compiler compiler options cmdvar resvar)
+  execute_process(
+    COMMAND "${compiler}" ${options}
+    OUTPUT_VARIABLE  cmdline OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_VARIABLE   cmdline ERROR_STRIP_TRAILING_WHITESPACE
+    RESULT_VARIABLE  success)
+  set(${cmdvar} "${cmdline}" PARENT_SCOPE)
+  set(${resvar} "${success}" PARENT_SCOPE)
+endfunction()
 
 #
 # interrogate_mpi_compiler(lang try_libs)
@@ -220,12 +229,7 @@ function (interrogate_mpi_compiler lang try_libs)
     if (MPI_${lang}_COMPILER)
       # Check whether the -showme:compile option works. This indicates that we have either OpenMPI
       # or a newer version of LAM-MPI, and implies that -showme:link will also work.
-      execute_process(
-        COMMAND ${MPI_${lang}_COMPILER} -showme:compile
-        OUTPUT_VARIABLE  MPI_COMPILE_CMDLINE OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_VARIABLE   MPI_COMPILE_CMDLINE ERROR_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE  MPI_COMPILER_RETURN)
-
+      _mpi_check_compiler("${MPI_${lang}_COMPILER}" "-showme:compile" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
       if (MPI_COMPILER_RETURN EQUAL 0)
         # If we appear to have -showme:compile, then we should
         # also have -showme:link. Try it.
@@ -257,20 +261,12 @@ function (interrogate_mpi_compiler lang try_libs)
 
       # Older versions of LAM-MPI have "-showme". Try to find that.
       if (NOT MPI_COMPILER_RETURN EQUAL 0)
-        execute_process(
-          COMMAND ${MPI_${lang}_COMPILER} -showme
-          OUTPUT_VARIABLE  MPI_COMPILE_CMDLINE OUTPUT_STRIP_TRAILING_WHITESPACE
-          ERROR_VARIABLE   MPI_COMPILE_CMDLINE ERROR_STRIP_TRAILING_WHITESPACE
-          RESULT_VARIABLE  MPI_COMPILER_RETURN)
+        _mpi_check_compiler("${MPI_${lang}_COMPILER}" "-showme" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
       endif()
 
       # MVAPICH uses -compile-info and -link-info.  Try them.
       if (NOT MPI_COMPILER_RETURN EQUAL 0)
-        execute_process(
-          COMMAND ${MPI_${lang}_COMPILER} -compile-info
-          OUTPUT_VARIABLE  MPI_COMPILE_CMDLINE OUTPUT_STRIP_TRAILING_WHITESPACE
-          ERROR_VARIABLE   MPI_COMPILE_CMDLINE ERROR_STRIP_TRAILING_WHITESPACE
-          RESULT_VARIABLE  MPI_COMPILER_RETURN)
+        _mpi_check_compiler("${MPI_${lang}_COMPILER}" "-compile-info" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
 
         # If we have compile-info, also have link-info.
         if (MPI_COMPILER_RETURN EQUAL 0)
@@ -290,11 +286,7 @@ function (interrogate_mpi_compiler lang try_libs)
 
       # MPICH just uses "-show". Try it.
       if (NOT MPI_COMPILER_RETURN EQUAL 0)
-        execute_process(
-          COMMAND ${MPI_${lang}_COMPILER} -show
-          OUTPUT_VARIABLE  MPI_COMPILE_CMDLINE OUTPUT_STRIP_TRAILING_WHITESPACE
-          ERROR_VARIABLE   MPI_COMPILE_CMDLINE ERROR_STRIP_TRAILING_WHITESPACE
-          RESULT_VARIABLE  MPI_COMPILER_RETURN)
+        _mpi_check_compiler("${MPI_${lang}_COMPILER}" "-show" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
       endif()
 
       if (MPI_COMPILER_RETURN EQUAL 0)
-- 
2.1.3

From 7626c8dcf632a4589c2a9008f083f7777cee946a Mon Sep 17 00:00:00 2001
Message-Id: <7626c8dcf632a4589c2a9008f083f7777cee946a.1417720607.git.brad.king@kitware.com>
In-Reply-To: <f5ede30006f61ef5bb78d6602ebd9083cd7f9869.1417720607.git.brad.king@kitware.com>
References: <f5ede30006f61ef5bb78d6602ebd9083cd7f9869.1417720607.git.brad.king@kitware.com>
From: Alin Marin Elena <alinm.elena@gmail.com>
Date: Thu, 4 Dec 2014 13:54:00 -0500
Subject: [PATCH 2/2] FindMPI: Workaround Intel MPI 5.0.1 exit code problem
 (#15182)

This MPI compiler may return zero even in some error cases.  Check the
output to catch such cases.

Suggested-by: Kelly Thompson <kgt@lanl.gov>
---
 Modules/FindMPI.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index e135edb..6f6dcf3 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -194,6 +194,12 @@ function (_mpi_check_compiler compiler options cmdvar resvar)
     OUTPUT_VARIABLE  cmdline OUTPUT_STRIP_TRAILING_WHITESPACE
     ERROR_VARIABLE   cmdline ERROR_STRIP_TRAILING_WHITESPACE
     RESULT_VARIABLE  success)
+  # 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")
+    set(success 255 )
+  endif()
   set(${cmdvar} "${cmdline}" PARENT_SCOPE)
   set(${resvar} "${success}" PARENT_SCOPE)
 endfunction()
-- 
2.1.3

--- ../Utils/cmake/Modules/FindMPI.cmake	2014-12-04 22:21:03.880000302 +0000
+++ ../Utils/cmake/Modules/FindMPI.cmake.orig	2014-12-04 22:11:48.620774632 +0000
@@ -373,17 +373,6 @@ function (interrogate_mpi_compiler lang
           endif()
         endforeach()
 
-        # Extract linker flags from the link command line  Intel compilers.. others maybe
-        string(REGEX MATCHALL "(^| )-Xlinker ([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
-        set(MPI_LINK_FLAGS_WORK)
-        foreach(FLAG ${MPI_ALL_LINK_FLAGS})
-          if (MPI_LINK_FLAGS_WORK)
-            set(MPI_LINK_FLAGS_WORK "${MPI_LINK_FLAGS_WORK} ${FLAG}")
-          else()
-            set(MPI_LINK_FLAGS_WORK ${FLAG})
-          endif()
-        endforeach()
-
         # Extract the set of libraries to link against from the link command
         # line
         string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
@@ -578,12 +567,6 @@ endforeach()
 # This loop finds the compilers and sends them off for interrogation.
 foreach (lang C CXX Fortran)
   if (CMAKE_${lang}_COMPILER_WORKS)
-    # first ditch try -- try our luck, just try running the regular compiler and
-    # see if we can create an MPI executable.
-    set(regular_compiler_worked 0)
-    if (NOT MPI_${lang}_LIBRARIES OR NOT MPI_${lang}_INCLUDE_PATH)
-      try_regular_compiler(${lang} regular_compiler_worked)
-    endif()
     # If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler.
     if (MPI_${lang}_COMPILER)
       is_file_executable(MPI_${lang}_COMPILER MPI_COMPILER_IS_EXECUTABLE)
@@ -606,6 +589,13 @@ foreach (lang C CXX Fortran)
     interrogate_mpi_compiler(${lang} ${try_libs})
     mark_as_advanced(MPI_${lang}_COMPILER)
 
+    # last ditch try -- if nothing works so far, just try running the regular compiler and
+    # see if we can create an MPI executable.
+    set(regular_compiler_worked 0)
+    if (NOT MPI_${lang}_LIBRARIES OR NOT MPI_${lang}_INCLUDE_PATH)
+      try_regular_compiler(${lang} regular_compiler_worked)
+    endif()
+
     set(MPI_${lang}_FIND_QUIETLY ${MPI_FIND_QUIETLY})
     set(MPI_${lang}_FIND_REQUIRED ${MPI_FIND_REQUIRED})
     set(MPI_${lang}_FIND_VERSION ${MPI_FIND_VERSION})