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

cmGlobalUnixMakefileGenerator3: Rename member.

This commit is contained in:
Stephen Kelly 2015-08-23 17:52:30 +02:00
parent 2394584ce2
commit 04168cbb59
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/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -921,7 +921,7 @@ cmGlobalUnixMakefileGenerator3
// generator directory level. // generator directory level.
void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
{ {
this->LocalGeneratorToTargetMap.clear(); this->DirectoryTargetsMap.clear();
// Loop over all targets in all local generators. // Loop over all targets in all local generators.
for(std::vector<cmLocalGenerator*>::const_iterator for(std::vector<cmLocalGenerator*>::const_iterator
lgi = this->LocalGenerators.begin(); lgi = this->LocalGenerators.begin();
@ -943,7 +943,7 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
{ {
// This local generator includes the target. // This local generator includes the target.
std::set<cmGeneratorTarget const*>& targetSet = std::set<cmGeneratorTarget const*>& targetSet =
this->LocalGeneratorToTargetMap[clg]; this->DirectoryTargetsMap[clg];
targetSet.insert(gt); targetSet.insert(gt);
// Add dependencies of the included target. An excluded // Add dependencies of the included target. An excluded
@ -992,7 +992,7 @@ cmGlobalUnixMakefileGenerator3
size_t count = 0; size_t count = 0;
std::set<cmGeneratorTarget const*> emitted; std::set<cmGeneratorTarget const*> emitted;
std::set<cmGeneratorTarget const*> const& targets std::set<cmGeneratorTarget const*> const& targets
= this->LocalGeneratorToTargetMap[lg]; = this->DirectoryTargetsMap[lg];
for(std::set<cmGeneratorTarget const*>::const_iterator t = targets.begin(); for(std::set<cmGeneratorTarget const*>::const_iterator t = targets.begin();
t != targets.end(); ++t) t != targets.end(); ++t)
{ {

2
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -208,7 +208,7 @@ private:
virtual std::string GetEditCacheCommand() const; virtual std::string GetEditCacheCommand() const;
std::map<cmLocalGenerator*, std::set<cmGeneratorTarget const*> > std::map<cmLocalGenerator*, std::set<cmGeneratorTarget const*> >
LocalGeneratorToTargetMap; DirectoryTargetsMap;
virtual void InitializeProgressMarks(); virtual void InitializeProgressMarks();
}; };