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

cmMakefile: Simplify handling of CACHE_VARIABLES property.

This commit is contained in:
Stephen Kelly 2015-06-07 15:11:04 +02:00
parent 1981c9718b
commit 021c4b6f2b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmMakefile.cxx
View File

@ -4163,14 +4163,14 @@ const char *cmMakefile::GetProperty(const std::string& prop,
output = cmJoin(this->ListFileStack, ";"); output = cmJoin(this->ListFileStack, ";");
return output.c_str(); return output.c_str();
} }
else if (prop == "VARIABLES" || prop == "CACHE_VARIABLES") else if ( prop == "CACHE_VARIABLES" )
{ {
int cacheonly = 0; output = cmJoin(this->GetState()->GetCacheEntryKeys(), ";");
if ( prop == "CACHE_VARIABLES" ) return output.c_str();
{ }
cacheonly = 1; else if (prop == "VARIABLES")
} {
output = cmJoin(this->GetDefinitions(cacheonly), ";"); output = cmJoin(this->GetDefinitions(), ";");
return output.c_str(); return output.c_str();
} }
else if (prop == "MACROS") else if (prop == "MACROS")