summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-07-25 07:12:28 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-07-26 14:58:25 (GMT)
commitb8dc7fad23a0b6867dae30e3cd6a23c82d6cfac9 (patch)
tree2e1bf0429e6c4413eddbfe064f97bf6b67ef3ce5 /Source/cmTarget.cxx
parentc8a10ba9ad8707cfb892ca812efa2f6899adf60b (diff)
downloadCMake-b8dc7fad23a0b6867dae30e3cd6a23c82d6cfac9.zip
CMake-b8dc7fad23a0b6867dae30e3cd6a23c82d6cfac9.tar.gz
CMake-b8dc7fad23a0b6867dae30e3cd6a23c82d6cfac9.tar.bz2
Genex: Disallow LINKER_LANGUAGE only when used on a static library.
For shared libraries and executables, the linker_language is indepenedent of the linked libraries.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 622e812..ffd4008 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6241,7 +6241,7 @@ void cmTarget::ComputeImportInfo(std::string const& desired_config,
}
// Get the link languages.
- if(this->GetType() == cmTarget::STATIC_LIBRARY)
+ if(this->LinkLanguagePropagatesToDependents())
{
std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES";
linkProp += suffix;
@@ -6470,7 +6470,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
else
{
iface.Libraries = impl->Libraries;
- if(this->GetType() == cmTarget::STATIC_LIBRARY)
+ if(this->LinkLanguagePropagatesToDependents())
{
// Targets using this archive need its language runtime libraries.
iface.Languages = impl->Languages;
@@ -6539,7 +6539,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
}
}
}
- if(this->GetType() == cmTarget::STATIC_LIBRARY)
+ if(this->LinkLanguagePropagatesToDependents())
{
// Targets using this archive need its language runtime libraries.
iface.Languages = impl->Languages;
@@ -6558,7 +6558,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
iface.ImplementationIsInterface = true;
iface.Libraries = impl->Libraries;
iface.WrongConfigLibraries = impl->WrongConfigLibraries;
- if(this->GetType() == cmTarget::STATIC_LIBRARY)
+ if(this->LinkLanguagePropagatesToDependents())
{
// Targets using this archive need its language runtime libraries.
iface.Languages = impl->Languages;