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

cmTarget: Rename LinkInterfaceIncludeDirectoriesEntries 

This can be used for COMPILE_OPTIONS too.
This commit is contained in:
Stephen Kelly 2013-05-28 12:39:32 +02:00
parent 47f80d9c43
commit 7cb23084b2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmTarget.cxx
View File

@ -140,7 +140,7 @@ public:
const std::string TargetName; const std::string TargetName;
}; };
std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries; std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries;
std::vector<cmValueWithOrigin> LinkInterfaceIncludeDirectoriesEntries; std::vector<cmValueWithOrigin> LinkInterfacePropertyEntries;
std::map<std::string, std::vector<TargetPropertyEntry*> > std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceIncludeDirectoriesEntries; CachedLinkInterfaceIncludeDirectoriesEntries;
@ -2741,14 +2741,14 @@ void cmTarget::SetProperty(const char* prop, const char* value)
} }
if (strcmp(prop, "LINK_LIBRARIES") == 0) if (strcmp(prop, "LINK_LIBRARIES") == 0)
{ {
this->Internal->LinkInterfaceIncludeDirectoriesEntries.clear(); this->Internal->LinkInterfacePropertyEntries.clear();
if (cmGeneratorExpression::IsValidTargetName(value) if (cmGeneratorExpression::IsValidTargetName(value)
|| cmGeneratorExpression::Find(value) != std::string::npos) || cmGeneratorExpression::Find(value) != std::string::npos)
{ {
cmListFileBacktrace lfbt; cmListFileBacktrace lfbt;
this->Makefile->GetBacktrace(lfbt); this->Makefile->GetBacktrace(lfbt);
cmValueWithOrigin entry(value, lfbt); cmValueWithOrigin entry(value, lfbt);
this->Internal->LinkInterfaceIncludeDirectoriesEntries.push_back(entry); this->Internal->LinkInterfacePropertyEntries.push_back(entry);
} }
// Fall through // Fall through
} }
@ -2789,7 +2789,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->LinkInterfaceIncludeDirectoriesEntries.push_back(entry); this->Internal->LinkInterfacePropertyEntries.push_back(entry);
} }
// Fall through // Fall through
} }
@ -3036,8 +3036,8 @@ std::vector<std::string> cmTarget::GetIncludeDirectories(const char *config)
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->LinkInterfaceIncludeDirectoriesEntries.begin(), it = this->Internal->LinkInterfacePropertyEntries.begin(),
end = this->Internal->LinkInterfaceIncludeDirectoriesEntries.end(); end = this->Internal->LinkInterfacePropertyEntries.end();
it != end; ++it) it != end; ++it)
{ {
{ {