diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-19 14:38:42 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-19 14:38:42 (GMT) |
| commit | 87eab93ad61fffda0ec4f9e779a325178183f7be (patch) | |
| tree | eed5621cc084aa0338cba489e99de3757927f950 | |
| parent | d5f8abc286ab69a0e136e51fec3d02acb7604abd (diff) | |
| parent | 31b3bbd73ee9c7843305e6289ff73e614ea227fb (diff) | |
| download | CMake-87eab93ad61fffda0ec4f9e779a325178183f7be.zip CMake-87eab93ad61fffda0ec4f9e779a325178183f7be.tar.gz CMake-87eab93ad61fffda0ec4f9e779a325178183f7be.tar.bz2 | |
Merge topic 'fix-CMP0022-language-propagation'
31b3bbd7 Merge branch 'backport-fix-CMP0022-language-propagation' into fix-CMP0022-language-propagation
40b9cd0f CMP0022: Fix link language propagation in NEW behavior
42bbf130 CMP0022: Fix link language propagation in NEW behavior
| -rw-r--r-- | Source/cmTarget.cxx | 14 | ||||
| -rw-r--r-- | Tests/Fortran/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 8 deletions
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}") |