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 20a0ba63263f547191193743fd8df33e04504019 (commit) via 99591a9f03bd57d22488947a5a586460da8619a7 (commit) from ea0c9cd1792f84e7d774fa2a8309bdbec7cdd418 (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=20a0ba63263f547191193743fd8df33e04504019 commit 20a0ba63263f547191193743fd8df33e04504019 Merge: ea0c9cd 99591a9 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Fri Jul 26 10:56:08 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jul 26 10:56:08 2013 -0400 Merge topic 'link-language-static-lib' into next 99591a9 Revert "Genex: Disallow LINKER_LANGUAGE only when used on a static library." http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99591a9f03bd57d22488947a5a586460da8619a7 commit 99591a9f03bd57d22488947a5a586460da8619a7 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Fri Jul 26 16:55:40 2013 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Fri Jul 26 16:55:40 2013 +0200 Revert "Genex: Disallow LINKER_LANGUAGE only when used on a static library." This reverts commit a8c9095d98b18a166989d8d412c3b56db63f029b. diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 084b731..b59298f 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -790,12 +790,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode if (propertyName == "LINKER_LANGUAGE") { - if (target->LinkLanguageDependsOnLinkImplementation() && - dagCheckerParent && dagCheckerParent->EvaluatingLinkLibraries()) + if (dagCheckerParent && dagCheckerParent->EvaluatingLinkLibraries()) { reportError(context, content->GetOriginalExpression(), "LINKER_LANGUAGE target property can not be used while evaluating " - "link libraries for a static library"); + "link libraries"); return std::string(); } const char *lang = target->GetLinkerLanguage(context->Config); diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index dbbe36d..26bf9b7 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -6193,7 +6193,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config, } // Get the link languages. - if(this->LinkLanguageDependsOnLinkImplementation()) + if(this->GetType() == cmTarget::STATIC_LIBRARY) { std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES"; linkProp += suffix; @@ -6495,7 +6495,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface, iface.ImplementationIsInterface = true; iface.Libraries = impl->Libraries; iface.WrongConfigLibraries = impl->WrongConfigLibraries; - if(this->LinkLanguageDependsOnLinkImplementation()) + if(this->GetType() == cmTarget::STATIC_LIBRARY) { // Targets using this archive need its language runtime libraries. iface.Languages = impl->Languages; diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 962fe5a..0da0f12 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -543,9 +543,6 @@ public: void FinalizeSystemIncludeDirectories(); - bool LinkLanguageDependsOnLinkImplementation() const - { return this->TargetTypeValue == STATIC_LIBRARY; } - private: // The set of include directories that are marked as system include // directories. diff --git a/Tests/RunCMake/Languages/LINK_LANGUAGE-genex.cmake b/Tests/RunCMake/Languages/LINK_LANGUAGE-genex.cmake index 64f394c..d4e31cd 100644 --- a/Tests/RunCMake/Languages/LINK_LANGUAGE-genex.cmake +++ b/Tests/RunCMake/Languages/LINK_LANGUAGE-genex.cmake @@ -1,4 +1,4 @@ -add_library(foo STATIC empty.cpp) -add_library(bar STATIC empty.cpp) +add_library(foo SHARED empty.cpp) +add_library(bar SHARED empty.cpp) target_link_libraries(foo $<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,anything>:bar>) ----------------------------------------------------------------------- Summary of changes: Source/cmGeneratorExpressionEvaluator.cxx | 5 ++--- Source/cmTarget.cxx | 4 ++-- Source/cmTarget.h | 3 --- Tests/RunCMake/Languages/LINK_LANGUAGE-genex.cmake | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits