diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-19 14:33:54 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-24 18:05:37 (GMT) |
| commit | 6c832219eadb6062c5026817ed86b81e583c8e5d (patch) | |
| tree | 61e5e044e921da2bd1e854d559beb4f1e47e259d /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 3fcf383763e80b90e30fa06b29e0751ca19ab983 (diff) | |
| download | CMake-6c832219eadb6062c5026817ed86b81e583c8e5d.zip CMake-6c832219eadb6062c5026817ed86b81e583c8e5d.tar.gz CMake-6c832219eadb6062c5026817ed86b81e583c8e5d.tar.bz2 | |
cmLocalGenerator: Implement child traversal in terms of cmState.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index d951c13..fd7c768 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -495,10 +495,12 @@ cmGlobalUnixMakefileGenerator3 // The directory-level rule should depend on the directory-level // rules of the subdirectories. - for(std::vector<cmLocalGenerator*>::iterator sdi = - lg->GetChildren().begin(); sdi != lg->GetChildren().end(); ++sdi) + std::vector<cmState::Snapshot> children + = lg->GetMakefile()->GetStateSnapshot().GetChildren(); + for(std::vector<cmState::Snapshot>::const_iterator + ci = children.begin(); ci != children.end(); ++ci) { - std::string subdir = (*sdi)->GetMakefile()->GetCurrentBinaryDirectory(); + std::string subdir = ci->GetDirectory().GetCurrentBinary(); subdir += "/"; subdir += pass; depends.push_back(subdir); |