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

cmGlobalUnixMakefileGenerator3: Implement progress in terms of cmState.

This commit is contained in:
Stephen Kelly 2015-08-02 10:41:55 +02:00
parent 65c434e1b0
commit 7fbc56ac40
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -944,14 +944,17 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
continue; continue;
} }
cmState::Snapshot csnp = lg->GetStateSnapshot();
cmState::Snapshot tsnp = tlg->GetStateSnapshot();
// Consider the directory containing the target and all its // Consider the directory containing the target and all its
// parents until something excludes the target. // parents until something excludes the target.
for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, tlg); for( ; csnp.IsValid() && !this->IsExcluded(csnp, tsnp);
clg = clg->GetParent()) csnp = csnp.GetBuildsystemDirectoryParent())
{ {
// 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->GetStateSnapshot()]; this->DirectoryTargetsMap[csnp];
targetSet.insert(gt); targetSet.insert(gt);
// Add dependencies of the included target. An excluded // Add dependencies of the included target. An excluded