diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-06-07 13:12:51 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-06-07 13:21:56 (GMT) |
commit | 4c192fb53152a61015eb29c0a3826adeec16f8f8 (patch) | |
tree | 9841583e7db97b1b9d3a17b24a1529fd532f57e8 /Source/cmMakefile.cxx | |
parent | 046aafff12e6fa9834c7c114a59389df404ddf18 (diff) | |
download | CMake-4c192fb53152a61015eb29c0a3826adeec16f8f8.zip CMake-4c192fb53152a61015eb29c0a3826adeec16f8f8.tar.gz CMake-4c192fb53152a61015eb29c0a3826adeec16f8f8.tar.bz2 |
cmMakefile: Remove cacheOnly option from GetDefinitions.
It is now unused.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index b083f70..2a3c51b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2497,18 +2497,11 @@ const char* cmMakefile::GetSafeDefinition(const std::string& def) const return ret; } -std::vector<std::string> cmMakefile -::GetDefinitions(int cacheonly /* = 0 */) const +std::vector<std::string> cmMakefile::GetDefinitions() const { - std::vector<std::string> res; - if ( !cacheonly ) - { - res = this->Internal->ClosureKeys(); - } - std::vector<std::string> cacheKeys = - this->GetState()->GetCacheEntryKeys(); + std::vector<std::string> res = this->Internal->ClosureKeys(); + std::vector<std::string> cacheKeys = this->GetState()->GetCacheEntryKeys(); res.insert(res.end(), cacheKeys.begin(), cacheKeys.end()); - std::sort(res.begin(), res.end()); return res; } |