diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-07 13:11:04 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-07 13:21:55 (GMT) |
| commit | 021c4b6f2bced25c9adbb472b94148987e1b6398 (patch) | |
| tree | 79ef3270a9adf0633e5068358b7637cfbbaf95fa /Source | |
| parent | 1981c9718b7099670b03535a241c735477d6bc6c (diff) | |
| download | CMake-021c4b6f2bced25c9adbb472b94148987e1b6398.zip CMake-021c4b6f2bced25c9adbb472b94148987e1b6398.tar.gz CMake-021c4b6f2bced25c9adbb472b94148987e1b6398.tar.bz2 | |
cmMakefile: Simplify handling of CACHE_VARIABLES property.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 3ac77e9..b083f70 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4163,14 +4163,14 @@ const char *cmMakefile::GetProperty(const std::string& prop, output = cmJoin(this->ListFileStack, ";"); return output.c_str(); } - else if (prop == "VARIABLES" || prop == "CACHE_VARIABLES") + else if ( prop == "CACHE_VARIABLES" ) { - int cacheonly = 0; - if ( prop == "CACHE_VARIABLES" ) - { - cacheonly = 1; - } - output = cmJoin(this->GetDefinitions(cacheonly), ";"); + output = cmJoin(this->GetState()->GetCacheEntryKeys(), ";"); + return output.c_str(); + } + else if (prop == "VARIABLES") + { + output = cmJoin(this->GetDefinitions(), ";"); return output.c_str(); } else if (prop == "MACROS") |