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

cmGeneratorTarget: Rename internal member. 

Leave the old name available for another use.
This commit is contained in:
Stephen Kelly 2015-08-29 18:47:14 +02:00
parent 9d653f9c1c
commit bf28b7874b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGeneratorTarget.cxx
View File

@ -406,8 +406,8 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
std::vector<cmSourceFile*> const* std::vector<cmSourceFile*> const*
cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const
{ {
SourceEntriesType::const_iterator i = this->SourceEntries.find(sf); SourceEntriesType::const_iterator i = this->SourceDepends.find(sf);
if(i != this->SourceEntries.end()) if(i != this->SourceDepends.end())
{ {
return &i->second.Depends; return &i->second.Depends;
} }
@ -1723,7 +1723,7 @@ void cmTargetTraceDependencies::Trace()
// Get the next source from the queue. // Get the next source from the queue.
cmSourceFile* sf = this->SourceQueue.front(); cmSourceFile* sf = this->SourceQueue.front();
this->SourceQueue.pop(); this->SourceQueue.pop();
this->CurrentEntry = &this->GeneratorTarget->SourceEntries[sf]; this->CurrentEntry = &this->GeneratorTarget->SourceDepends[sf];
// Queue dependencies added explicitly by the user. // Queue dependencies added explicitly by the user.
if(const char* additionalDeps = sf->GetProperty("OBJECT_DEPENDS")) if(const char* additionalDeps = sf->GetProperty("OBJECT_DEPENDS"))

2
Source/cmGeneratorTarget.h
View File

@ -370,7 +370,7 @@ private:
friend class cmTargetTraceDependencies; friend class cmTargetTraceDependencies;
struct SourceEntry { std::vector<cmSourceFile*> Depends; }; struct SourceEntry { std::vector<cmSourceFile*> Depends; };
typedef std::map<cmSourceFile const*, SourceEntry> SourceEntriesType; typedef std::map<cmSourceFile const*, SourceEntry> SourceEntriesType;
SourceEntriesType SourceEntries; SourceEntriesType SourceDepends;
mutable std::map<cmSourceFile const*, std::string> Objects; mutable std::map<cmSourceFile const*, std::string> Objects;
std::set<cmSourceFile const*> ExplicitObjectName; std::set<cmSourceFile const*> ExplicitObjectName;
mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache; mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache;