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

cmGlobalUnixMakefileGenerator3: Change the progress container key.

Browse Source
This commit is contained in:
Stephen Kelly 2015-08-02 10:29:01 +02:00
parent 55e3927634
commit 3fa1b9641d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -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->DirectoryTargetsMap[clg]; this->DirectoryTargetsMap[clg->GetStateSnapshot()];
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->DirectoryTargetsMap[lg]; = this->DirectoryTargetsMap[lg->GetStateSnapshot()];
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)
{ {

5
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -207,8 +207,9 @@ private:
virtual const char* GetBuildIgnoreErrorsFlag() const { return "-i"; } virtual const char* GetBuildIgnoreErrorsFlag() const { return "-i"; }
virtual std::string GetEditCacheCommand() const; virtual std::string GetEditCacheCommand() const;
std::map<cmLocalGenerator*, std::set<cmGeneratorTarget const*> > std::map<cmState::Snapshot,
DirectoryTargetsMap; std::set<cmGeneratorTarget const*>,
cmState::Snapshot::StrictWeakOrder> DirectoryTargetsMap;
virtual void InitializeProgressMarks(); virtual void InitializeProgressMarks();
}; };