[Cmake-commits] CMake branch, next, updated. v3.3.0-1607-gfb65bd6

[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  fb65bd6b653a30e83faf97c73e0de1961f6e5c7e (commit)
       via  6d6d147685f57d578a1859de7202fa776bdeba72 (commit)
      from  3394db5b8debc195eae4275ae1e9c8e74611d422 (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=fb65bd6b653a30e83faf97c73e0de1961f6e5c7e
commit fb65bd6b653a30e83faf97c73e0de1961f6e5c7e
Merge: 3394db5 6d6d147
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 31 09:50:09 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 31 09:50:09 2015 -0400

    Merge topic 'GetPrerequisites-updates' into next
    
    6d6d1476 FindMPI: Drop unnecessary and incorrect use of GetPrerequisites


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d6d147685f57d578a1859de7202fa776bdeba72
commit 6d6d147685f57d578a1859de7202fa776bdeba72
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 31 09:42:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 31 09:49:15 2015 -0400

    FindMPI: Drop unnecessary and incorrect use of GetPrerequisites
    
    Since commit v2.8.5~121^2~2 (FindMPI: Handle multiple languages,
    2010-12-29) we called the GetPrerequisites is_file_executable function
    but passed the name of a CMake variable instead of its value.  Therefore
    the function has always failed and caused the search for the compiler
    name to run even with an absolute path.  Switch to using if(IS_ABSOLUTE)
    instead and drop use of GetPrerequisites.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 06ecfaa..48adf3c 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -102,7 +102,6 @@
 
 # include this to handle the QUIETLY and REQUIRED arguments
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/GetPrerequisites.cmake)
 
 #
 # This part detects MPI compilers, attempting to wade through the mess of compiler names in
@@ -578,14 +577,13 @@ foreach (lang C CXX Fortran)
   if (CMAKE_${lang}_COMPILER_WORKS)
     # 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)
-      if (NOT MPI_COMPILER_IS_EXECUTABLE)
+      if (NOT IS_ABSOLUTE "${MPI_${lang}_COMPILER}")
         # Get rid of our default list of names and just search for the name the user wants.
         set(_MPI_${lang}_COMPILER_NAMES ${MPI_${lang}_COMPILER})
         set(MPI_${lang}_COMPILER "MPI_${lang}_COMPILER-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
-        # If the user specifies a compiler, we don't want to try to search libraries either.
-        set(try_libs FALSE)
       endif()
+      # If the user specifies a compiler, we don't want to try to search libraries either.
+      set(try_libs FALSE)
     else()
       set(try_libs TRUE)
     endif()

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

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


hooks/post-receive
-- 
CMake