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

cmTarget: Rename container holding link implementation objects. 

Don't erroneously name it for the link implementation. That's
something different.
This commit is contained in:
Stephen Kelly 2013-12-26 08:09:39 +01:00
parent a0cacb5521
commit 5c0a06ab84
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/cmTarget.cxx
View File

@ -136,7 +136,7 @@ public:
std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries; std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries;
std::vector<TargetPropertyEntry*> CompileOptionsEntries; std::vector<TargetPropertyEntry*> CompileOptionsEntries;
std::vector<TargetPropertyEntry*> CompileDefinitionsEntries; std::vector<TargetPropertyEntry*> CompileDefinitionsEntries;
std::vector<cmValueWithOrigin> LinkInterfacePropertyEntries; std::vector<cmValueWithOrigin> LinkImplementationPropertyEntries;
mutable std::map<std::string, std::vector<TargetPropertyEntry*> > mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceIncludeDirectoriesEntries; CachedLinkInterfaceIncludeDirectoriesEntries;
@ -1042,8 +1042,8 @@ cmTarget::AddSystemIncludeDirectories(const std::vector<std::string> &incs)
void cmTarget::FinalizeSystemIncludeDirectories() void cmTarget::FinalizeSystemIncludeDirectories()
{ {
for (std::vector<cmValueWithOrigin>::const_iterator for (std::vector<cmValueWithOrigin>::const_iterator
it = this->Internal->LinkInterfacePropertyEntries.begin(), it = this->Internal->LinkImplementationPropertyEntries.begin(),
end = this->Internal->LinkInterfacePropertyEntries.end(); end = this->Internal->LinkImplementationPropertyEntries.end();
it != end; ++it) it != end; ++it)
{ {
if (!cmGeneratorExpression::IsValidTargetName(it->Value) if (!cmGeneratorExpression::IsValidTargetName(it->Value)
@ -1495,11 +1495,11 @@ void cmTarget::SetProperty(const char* prop, const char* value)
} }
if (strcmp(prop, "LINK_LIBRARIES") == 0) if (strcmp(prop, "LINK_LIBRARIES") == 0)
{ {
this->Internal->LinkInterfacePropertyEntries.clear(); this->Internal->LinkImplementationPropertyEntries.clear();
cmListFileBacktrace lfbt; cmListFileBacktrace lfbt;
this->Makefile->GetBacktrace(lfbt); this->Makefile->GetBacktrace(lfbt);
cmValueWithOrigin entry(value, lfbt); cmValueWithOrigin entry(value, lfbt);
this->Internal->LinkInterfacePropertyEntries.push_back(entry); this->Internal->LinkImplementationPropertyEntries.push_back(entry);
return; return;
} }
this->Properties.SetProperty(prop, value, cmProperty::TARGET); this->Properties.SetProperty(prop, value, cmProperty::TARGET);
@ -1570,7 +1570,7 @@ void cmTarget::AppendProperty(const char* prop, const char* value,
cmListFileBacktrace lfbt; cmListFileBacktrace lfbt;
this->Makefile->GetBacktrace(lfbt); this->Makefile->GetBacktrace(lfbt);
cmValueWithOrigin entry(value, lfbt); cmValueWithOrigin entry(value, lfbt);
this->Internal->LinkInterfacePropertyEntries.push_back(entry); this->Internal->LinkImplementationPropertyEntries.push_back(entry);
return; return;
} }
this->Properties.AppendProperty(prop, value, cmProperty::TARGET, asString); this->Properties.AppendProperty(prop, value, cmProperty::TARGET, asString);
@ -1882,8 +1882,8 @@ cmTarget::GetIncludeDirectories(const char *config) const
if (!this->Internal->CacheLinkInterfaceIncludeDirectoriesDone[configString]) if (!this->Internal->CacheLinkInterfaceIncludeDirectoriesDone[configString])
{ {
for (std::vector<cmValueWithOrigin>::const_iterator for (std::vector<cmValueWithOrigin>::const_iterator
it = this->Internal->LinkInterfacePropertyEntries.begin(), it = this->Internal->LinkImplementationPropertyEntries.begin(),
end = this->Internal->LinkInterfacePropertyEntries.end(); end = this->Internal->LinkImplementationPropertyEntries.end();
it != end; ++it) it != end; ++it)
{ {
if (!cmGeneratorExpression::IsValidTargetName(it->Value) if (!cmGeneratorExpression::IsValidTargetName(it->Value)
@ -2111,8 +2111,8 @@ void cmTarget::GetCompileOptions(std::vector<std::string> &result,
if (!this->Internal->CacheLinkInterfaceCompileOptionsDone[configString]) if (!this->Internal->CacheLinkInterfaceCompileOptionsDone[configString])
{ {
for (std::vector<cmValueWithOrigin>::const_iterator for (std::vector<cmValueWithOrigin>::const_iterator
it = this->Internal->LinkInterfacePropertyEntries.begin(), it = this->Internal->LinkImplementationPropertyEntries.begin(),
end = this->Internal->LinkInterfacePropertyEntries.end(); end = this->Internal->LinkImplementationPropertyEntries.end();
it != end; ++it) it != end; ++it)
{ {
if (!cmGeneratorExpression::IsValidTargetName(it->Value) if (!cmGeneratorExpression::IsValidTargetName(it->Value)
@ -2224,8 +2224,8 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
if (!this->Internal->CacheLinkInterfaceCompileDefinitionsDone[configString]) if (!this->Internal->CacheLinkInterfaceCompileDefinitionsDone[configString])
{ {
for (std::vector<cmValueWithOrigin>::const_iterator for (std::vector<cmValueWithOrigin>::const_iterator
it = this->Internal->LinkInterfacePropertyEntries.begin(), it = this->Internal->LinkImplementationPropertyEntries.begin(),
end = this->Internal->LinkInterfacePropertyEntries.end(); end = this->Internal->LinkImplementationPropertyEntries.end();
it != end; ++it) it != end; ++it)
{ {
if (!cmGeneratorExpression::IsValidTargetName(it->Value) if (!cmGeneratorExpression::IsValidTargetName(it->Value)
@ -2800,8 +2800,8 @@ const char *cmTarget::GetProperty(const char* prop,
output = ""; output = "";
std::string sep; std::string sep;
for (std::vector<cmValueWithOrigin>::const_iterator for (std::vector<cmValueWithOrigin>::const_iterator
it = this->Internal->LinkInterfacePropertyEntries.begin(), it = this->Internal->LinkImplementationPropertyEntries.begin(),
end = this->Internal->LinkInterfacePropertyEntries.end(); end = this->Internal->LinkImplementationPropertyEntries.end();
it != end; ++it) it != end; ++it)
{ {
output += sep; output += sep;