Commit 021c4b6f authored by Stephen Kelly's avatar Stephen Kelly
Browse files

cmMakefile: Simplify handling of CACHE_VARIABLES property.

parent 1981c971
...@@ -4163,14 +4163,14 @@ const char *cmMakefile::GetProperty(const std::string& prop, ...@@ -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")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment