kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMakefile: Inline GetDefinitions into GetProperty. 

It will soon move to cmState.
This commit is contained in:
Stephen Kelly 2015-07-18 14:54:14 +02:00
parent 2370a99400
commit 0178754725
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
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")