diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 13:54:09 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-08 13:54:09 -0400 |
| commit | ccc6fe94453444ebd5e655a9f90a5d074049f846 (patch) | |
| tree | 97eaffae69c39b5dde06e96ddfb1b038d1affefe /Source/cmGetCMakePropertyCommand.cxx | |
| parent | 21c92a00bf50afedf52388c5f5a73cba7f756561 (diff) | |
| parent | 4c192fb53152a61015eb29c0a3826adeec16f8f8 (diff) | |
| download | cmake-ccc6fe94453444ebd5e655a9f90a5d074049f846.tar.gz | |
Merge topic 'clean-up-cmMakefile'
4c192fb5 cmMakefile: Remove cacheOnly option from GetDefinitions.
046aafff cmGetCMakePropertyCommand: Don't explicitly specify default param.
021c4b6f cmMakefile: Simplify handling of CACHE_VARIABLES property.
1981c971 cmMakefile: Simplify InitializeFromParent method.
353e422b cmMakefile: Remove unused GetPolicies method.
00bfa047 cmMakefile: Out-of-line the cmMakefileCall.
db74ce58 cmMakefile: Inline PushScope into PushFunctionScope.
ca140c2e cmMakefile: Create a unified raii for macro scopes.
d5dc4169 cmMakefile: Create a unified raii for function scopes.
Diffstat (limited to 'Source/cmGetCMakePropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetCMakePropertyCommand.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx index 76803c1036..61cf85b8e2 100644 --- a/Source/cmGetCMakePropertyCommand.cxx +++ b/Source/cmGetCMakePropertyCommand.cxx @@ -32,8 +32,7 @@ bool cmGetCMakePropertyCommand if ( args[1] == "VARIABLES" ) { - int cacheonly = 0; - std::vector<std::string> vars = this->Makefile->GetDefinitions(cacheonly); + std::vector<std::string> vars = this->Makefile->GetDefinitions(); if (!vars.empty()) { output = cmJoin(vars, ";"); |