kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGeneratorTarget: Move LinkLanguagePropagatesToDependents from cmTarget

This commit is contained in:
Stephen Kelly 2015-10-24 09:29:49 +02:00
parent 00b8c0a8d4
commit b397eae82e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGeneratorExpressionNode.cxx
View File

@ -999,7 +999,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
if (propertyName == "LINKER_LANGUAGE") if (propertyName == "LINKER_LANGUAGE")
{ {
if (target->Target->LinkLanguagePropagatesToDependents() && if (target->LinkLanguagePropagatesToDependents() &&
dagCheckerParent && (dagCheckerParent->EvaluatingLinkLibraries() dagCheckerParent && (dagCheckerParent->EvaluatingLinkLibraries()
|| dagCheckerParent->EvaluatingSources())) || dagCheckerParent->EvaluatingSources()))
{ {

4
Source/cmGeneratorTarget.cxx
View File

@ -4770,7 +4770,7 @@ void cmGeneratorTarget::ComputeLinkInterface(const std::string& config,
iface.WrongConfigLibraries = impl->WrongConfigLibraries; iface.WrongConfigLibraries = impl->WrongConfigLibraries;
} }
if(this->Target->LinkLanguagePropagatesToDependents()) if(this->LinkLanguagePropagatesToDependents())
{ {
// Targets using this archive need its language runtime libraries. // Targets using this archive need its language runtime libraries.
if(cmLinkImplementation const* impl = if(cmLinkImplementation const* impl =
@ -5485,7 +5485,7 @@ void cmGeneratorTarget::ComputeImportInfo(std::string const& desired_config,
} }
// Get the link languages. // Get the link languages.
if(this->Target->LinkLanguagePropagatesToDependents()) if(this->LinkLanguagePropagatesToDependents())
{ {
std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES"; std::string linkProp = "IMPORTED_LINK_INTERFACE_LANGUAGES";
linkProp += suffix; linkProp += suffix;

3
Source/cmGeneratorTarget.h
View File

@ -189,6 +189,9 @@ public:
std::set<std::string>const& GetUtilities() const; std::set<std::string>const& GetUtilities() const;
cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const; cmListFileBacktrace const* GetUtilityBacktrace(const std::string& u) const;
bool LinkLanguagePropagatesToDependents() const
{ return this->GetType() == cmState::STATIC_LIBRARY; }
/** Get the macro to define when building sources in this target. /** Get the macro to define when building sources in this target.
If no macro should be defined null is returned. */ If no macro should be defined null is returned. */
const char* GetExportMacro() const; const char* GetExportMacro() const;

3
Source/cmTarget.h
View File

@ -227,9 +227,6 @@ public:
std::set<std::string> const & GetSystemIncludeDirectories() const std::set<std::string> const & GetSystemIncludeDirectories() const
{ return this->SystemIncludeDirectories; } { return this->SystemIncludeDirectories; }
bool LinkLanguagePropagatesToDependents() const
{ return this->TargetTypeValue == cmState::STATIC_LIBRARY; }
cmStringRange GetIncludeDirectoriesEntries() const; cmStringRange GetIncludeDirectoriesEntries() const;
cmBacktraceRange GetIncludeDirectoriesBacktraces() const; cmBacktraceRange GetIncludeDirectoriesBacktraces() const;