diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-27 14:04:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-27 14:04:07 (GMT) |
| commit | 6904b6efdc2ea35c3490ba33cb352b03ea3085f5 (patch) | |
| tree | 1108c7e561412f01acf5bfa744d526a8656ee47b /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | a97bb6ae3f70febd207ef2373287237249f082e5 (diff) | |
| parent | 867b5be8b89c9b4f18ea604e1c61a154d0335c4c (diff) | |
| download | CMake-6904b6efdc2ea35c3490ba33cb352b03ea3085f5.zip CMake-6904b6efdc2ea35c3490ba33cb352b03ea3085f5.tar.gz CMake-6904b6efdc2ea35c3490ba33cb352b03ea3085f5.tar.bz2 | |
Merge topic 'rm-cmLocalGenerator-Children'
867b5be8 cmLocalGenerator: Remove unused Children member.
6c832219 cmLocalGenerator: Implement child traversal in terms of cmState.
3fcf3837 Makefiles: Remove valueless cast.
223f4a66 cmLocalGenerator: Simplify condition.
ae026f54 cmState: Store Children states in parent state.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 8c8c56e..92bef67 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -495,12 +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) { - cmLocalUnixMakefileGenerator3* slg = - static_cast<cmLocalUnixMakefileGenerator3*>(*sdi); - std::string subdir = slg->GetMakefile()->GetCurrentBinaryDirectory(); + std::string subdir = ci->GetDirectory().GetCurrentBinary(); subdir += "/"; subdir += pass; depends.push_back(subdir); |