[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2242-g6834f7b

[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  6834f7bf399ce3b569c03ae6c7f0018bce0866ba (commit)
       via  856bfe238c8efa7f9cd4e07b883f1571e7d01277 (commit)
      from  20944b4c8b072b8c5430f70a52dd1b20fe5dd4ff (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=6834f7bf399ce3b569c03ae6c7f0018bce0866ba
commit 6834f7bf399ce3b569c03ae6c7f0018bce0866ba
Merge: 20944b4 856bfe2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 11 10:00:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 11 10:00:51 2014 -0400

    Merge topic 'FindMPI-lang-implicit-dirs' into next
    
    856bfe23 FindMPI: Use compiler implicit link dirs for matching language (#14870)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=856bfe238c8efa7f9cd4e07b883f1571e7d01277
commit 856bfe238c8efa7f9cd4e07b883f1571e7d01277
Author:     Melven Roehrig-Zoellner <Melven.Roehrig-Zoellner at DLR.de>
AuthorDate: Wed Apr 9 16:22:00 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 11 09:59:48 2014 -0400

    FindMPI: Use compiler implicit link dirs for matching language (#14870)
    
    Update the logic added by commit 2f9ad7c6 (Fix FindMPI for the intel
    compiler on linux, 2012-03-20) to use the implicit link directories for
    the current ${lang} instead of hard-coding C or CXX which may not be
    enabled.  This is necessary for Fortran-only projects.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index c8d46ba..aa2dcee 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -378,19 +378,14 @@ function (interrogate_mpi_compiler lang try_libs)
         # Extract the set of libraries to link against from the link command
         # line
         string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
+
         # add the compiler implicit directories because some compilers
         # such as the intel compiler have libraries that show up
         # in the showme list that can only be found in the implicit
-        # link directories of the compiler. Do this for C++ and C
-        # compilers if the implicit link directories are defined.
-        if (DEFINED CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES)
-          set(MPI_LINK_PATH
-            "${MPI_LINK_PATH};${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}")
-        endif ()
-
-        if (DEFINED CMAKE_C_IMPLICIT_LINK_DIRECTORIES)
+        # link directories of the compiler.
+        if (DEFINED CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES)
           set(MPI_LINK_PATH
-            "${MPI_LINK_PATH};${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
+            "${MPI_LINK_PATH};${CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES}")
         endif ()
 
         # Determine full path names for all of the libraries that one needs

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

Summary of changes:
 Modules/FindMPI.cmake |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake