Przeglądaj źródła

cmMakefile: Inline GetDefinitions into GetProperty.

It will soon move to cmState.
Stephen Kelly 10 lat temu
rodzic
commit
0178754725
1 zmienionych plików z 5 dodań i 1 usunięć
  1. 5 1
      Source/cmMakefile.cxx

+ 5 - 1
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")