[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3188-g83d9bf1

[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  83d9bf1d8378adece81864e20ceacd7182b0f0af (commit)
       via  cfbe288553b3b044178dc0a14c57b9375e14ea66 (commit)
      from  6080b77c4cf03ccfae181353a42ddc08521ded38 (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=83d9bf1d8378adece81864e20ceacd7182b0f0af
commit 83d9bf1d8378adece81864e20ceacd7182b0f0af
Merge: 6080b77 cfbe288
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 16 14:29:35 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 16 14:29:35 2014 -0400

    Merge topic 'fix-CMP0022-language-propagation' into next
    
    cfbe2885 CMP0022: Fix link language propagation in NEW behavior


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfbe288553b3b044178dc0a14c57b9375e14ea66
commit cfbe288553b3b044178dc0a14c57b9375e14ea66
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri May 16 14:19:22 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 16 14:24:46 2014 -0400

    CMP0022: Fix link language propagation in NEW behavior
    
    The languages used in compiling static libraries need to be propagated
    to dependents unconditionally.  Factor the logic out of the main link
    interface conditions so that it occurs when CMP0022 is NEW and there are
    no explicit interface link libraries specified.
    
    Update Tests/Fortran to set CMP0022 to NEW to test this case.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3f2ae9e..a243de5 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6481,11 +6481,6 @@ void cmTargetInternals::ComputeLinkInterface(cmTarget const* thisTarget,
               }
             }
           }
-        if(thisTarget->LinkLanguagePropagatesToDependents())
-          {
-          // Targets using this archive need its language runtime libraries.
-          iface.Languages = impl->Languages;
-          }
         }
       }
     }
@@ -6497,9 +6492,14 @@ void cmTargetInternals::ComputeLinkInterface(cmTarget const* thisTarget,
                 impl = thisTarget->GetLinkImplementation(config, headTarget);
     iface.ImplementationIsInterface = true;
     iface.WrongConfigLibraries = impl->WrongConfigLibraries;
-    if(thisTarget->LinkLanguagePropagatesToDependents())
+    }
+
+  if(thisTarget->LinkLanguagePropagatesToDependents())
+    {
+    // Targets using this archive need its language runtime libraries.
+    if(cmTarget::LinkImplementation const* impl =
+       thisTarget->GetLinkImplementation(config, headTarget))
       {
-      // Targets using this archive need its language runtime libraries.
       iface.Languages = impl->Languages;
       }
     }
diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index bf6d629..ef3b317 100644
--- a/Tests/Fortran/CMakeLists.txt
+++ b/Tests/Fortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.0)
 project(testf C CXX Fortran)
 if(NOT DEFINED CMake_TEST_NESTED_MAKE_PROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
   set(CMake_TEST_NESTED_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}")

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

Summary of changes:
 Source/cmTarget.cxx          |   14 +++++++-------
 Tests/Fortran/CMakeLists.txt |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake