diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-02 10:29:01 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-23 18:05:13 +0200 |
| commit | 3fa1b9641dd16ad93c64737fd2eeb131cca70f76 (patch) | |
| tree | 60d490723884bd87303e72c7256c576907c714b8 | |
| parent | 55e3927634a4b071c1cf52cc2dc406b8973b82cc (diff) | |
| download | cmake-3fa1b9641dd16ad93c64737fd2eeb131cca70f76.tar.gz | |
cmGlobalUnixMakefileGenerator3: Change the progress container key.
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 4 | ||||
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 75c2fb8134..b240924b66 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -943,7 +943,7 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() { // This local generator includes the target. std::set<cmGeneratorTarget const*>& targetSet = - this->DirectoryTargetsMap[clg]; + this->DirectoryTargetsMap[clg->GetStateSnapshot()]; targetSet.insert(gt); // Add dependencies of the included target. An excluded @@ -992,7 +992,7 @@ cmGlobalUnixMakefileGenerator3 size_t count = 0; std::set<cmGeneratorTarget const*> emitted; std::set<cmGeneratorTarget const*> const& targets - = this->DirectoryTargetsMap[lg]; + = this->DirectoryTargetsMap[lg->GetStateSnapshot()]; for(std::set<cmGeneratorTarget const*>::const_iterator t = targets.begin(); t != targets.end(); ++t) { diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index 7601cc48a5..c738c1664e 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -207,8 +207,9 @@ private: virtual const char* GetBuildIgnoreErrorsFlag() const { return "-i"; } virtual std::string GetEditCacheCommand() const; - std::map<cmLocalGenerator*, std::set<cmGeneratorTarget const*> > - DirectoryTargetsMap; + std::map<cmState::Snapshot, + std::set<cmGeneratorTarget const*>, + cmState::Snapshot::StrictWeakOrder> DirectoryTargetsMap; virtual void InitializeProgressMarks(); }; |