diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-24 14:37:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-24 14:39:01 (GMT) |
| commit | 96189e99e10493ba9cd50be0f26177bd6bd599a8 (patch) | |
| tree | 2b5740be5ee2d3c7fe3c939a83ef6e3716d2091e /Source/cmMakefile.cxx | |
| parent | 96a013d44c020163865d5f2f270c4cc609e76322 (diff) | |
| parent | 006229278b54ee92003100773a0430565fb8fe87 (diff) | |
| download | CMake-96189e99e10493ba9cd50be0f26177bd6bd599a8.zip CMake-96189e99e10493ba9cd50be0f26177bd6bd599a8.tar.gz CMake-96189e99e10493ba9cd50be0f26177bd6bd599a8.tar.bz2 | |
Merge topic 'cmAppend'
006229278b Use cmAppend to append ranges to std::vector instances
999516478d cmAlgorithms: Add cmAppend function
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3366
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 7d0e318..e0f69cb 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2534,8 +2534,7 @@ const std::string& cmMakefile::GetSafeDefinition(const std::string& name) const std::vector<std::string> cmMakefile::GetDefinitions() const { std::vector<std::string> res = this->StateSnapshot.ClosureKeys(); - std::vector<std::string> cacheKeys = this->GetState()->GetCacheEntryKeys(); - res.insert(res.end(), cacheKeys.begin(), cacheKeys.end()); + cmAppend(res, this->GetState()->GetCacheEntryKeys()); std::sort(res.begin(), res.end()); return res; } |