mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-11 23:43:58 +03:00
Code Activity

cmMakefile: Inline GetDefinitions into GetProperty.

Browse Source 
It will soon move to cmState.
This commit is contained in:
Stephen Kelly committed 2015-08-24 19:48:45 +02:00
1 parent 2370a99400
commit 0178754725
1 file changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefile.cxx
+5 -1
View File
@@ -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")