diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-18 12:54:14 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-24 17:48:45 (GMT) |
| commit | 0178754725c61dc6778f8591db1433a6c07e9f6f (patch) | |
| tree | 3a981a9b18c8f6c55e7d3dcd844dcf182c29d21c | |
| parent | 2370a99400c6450606e25562386cf40bc9c41f38 (diff) | |
| download | CMake-0178754725c61dc6778f8591db1433a6c07e9f6f.zip CMake-0178754725c61dc6778f8591db1433a6c07e9f6f.tar.gz CMake-0178754725c61dc6778f8591db1433a6c07e9f6f.tar.bz2 | |
cmMakefile: Inline GetDefinitions into GetProperty.
It will soon move to cmState.
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 7ad37e6..3069218 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4183,7 +4183,11 @@ const char *cmMakefile::GetProperty(const std::string& prop, } else if (prop == "VARIABLES") { - output = cmJoin(this->GetDefinitions(), ";"); + std::vector<std::string> res = this->StateSnapshot.ClosureKeys(); + std::vector<std::string> cacheKeys = this->GetState()->GetCacheEntryKeys(); + res.insert(res.end(), cacheKeys.begin(), cacheKeys.end()); + std::sort(res.begin(), res.end()); + output = cmJoin(res, ";"); return output.c_str(); } else if (prop == "INCLUDE_DIRECTORIES") |