diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-02 08:41:55 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-24 18:03:30 (GMT) |
| commit | 7fbc56ac400fe7aaafaa581bca2f2848287ce7fd (patch) | |
| tree | 8f127d3399c08ccb7cbc10518624df40e9610946 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 65c434e1b0247a47df763a616d1c8fdb20daba5c (diff) | |
| download | CMake-7fbc56ac400fe7aaafaa581bca2f2848287ce7fd.zip CMake-7fbc56ac400fe7aaafaa581bca2f2848287ce7fd.tar.gz CMake-7fbc56ac400fe7aaafaa581bca2f2848287ce7fd.tar.bz2 | |
cmGlobalUnixMakefileGenerator3: Implement progress in terms of cmState.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 6a13977..8c8c56e 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -944,14 +944,17 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks() continue; } + cmState::Snapshot csnp = lg->GetStateSnapshot(); + cmState::Snapshot tsnp = tlg->GetStateSnapshot(); + // Consider the directory containing the target and all its // parents until something excludes the target. - for(cmLocalGenerator* clg = lg; clg && !this->IsExcluded(clg, tlg); - clg = clg->GetParent()) + for( ; csnp.IsValid() && !this->IsExcluded(csnp, tsnp); + csnp = csnp.GetBuildsystemDirectoryParent()) { // This local generator includes the target. std::set<cmGeneratorTarget const*>& targetSet = - this->DirectoryTargetsMap[clg->GetStateSnapshot()]; + this->DirectoryTargetsMap[csnp]; targetSet.insert(gt); // Add dependencies of the included target. An excluded |