From 0178754725c61dc6778f8591db1433a6c07e9f6f Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Sat, 18 Jul 2015 14:54:14 +0200
Subject: cmMakefile: Inline GetDefinitions into GetProperty.

It will soon move to cmState.
---
 Source/cmMakefile.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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")
-- 
cgit v0.12