diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-26 13:38:36 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-29 22:32:18 (GMT) |
| commit | 5ccff6408c93e67d7f8445ce1bf6465b068d6f6b (patch) | |
| tree | 4f1b66350da2c061872dd17713e26c856eb45a7c /Source/cmMakefile.cxx | |
| parent | f79cd99d6dcdfcdcd341c5ea90a5f2d9c4d6d3bc (diff) | |
| download | CMake-5ccff6408c93e67d7f8445ce1bf6465b068d6f6b.zip CMake-5ccff6408c93e67d7f8445ce1bf6465b068d6f6b.tar.gz CMake-5ccff6408c93e67d7f8445ce1bf6465b068d6f6b.tar.bz2 | |
cmDefinitions: Externalize looping for ClosureKeys.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6451874..1d3e496 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -98,7 +98,16 @@ public: std::vector<std::string> ClosureKeys() const { - return this->VarStack.back().ClosureKeys(); + std::vector<std::string> closureKeys; + std::set<std::string> bound; + for (std::list<cmDefinitions>::const_reverse_iterator it = + this->VarStack.rbegin(); it != this->VarStack.rend(); ++it) + { + std::vector<std::string> const& localKeys = it->ClosureKeys(bound); + closureKeys.insert(closureKeys.end(), + localKeys.begin(), localKeys.end()); + } + return closureKeys; } void PopDefinitions() |