diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-18 19:39:15 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-18 21:55:43 (GMT) |
| commit | f9785e0cb6c823849bb344e487d9e70d9fdaddb4 (patch) | |
| tree | d7ab3a0cab0148e11fdc45db05262724950b6dfe /Source/cmConditionEvaluator.cxx | |
| parent | e17b5e426294dc5cc86ba31dfd4d4acc553c0c72 (diff) | |
| download | CMake-f9785e0cb6c823849bb344e487d9e70d9fdaddb4.zip CMake-f9785e0cb6c823849bb344e487d9e70d9fdaddb4.tar.gz CMake-f9785e0cb6c823849bb344e487d9e70d9fdaddb4.tar.bz2 | |
cmMakefile: Simplify CMP0054 handling.
Diffstat (limited to 'Source/cmConditionEvaluator.cxx')
| -rw-r--r-- | Source/cmConditionEvaluator.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index e5a89b6..61847d4 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -112,10 +112,7 @@ const char* cmConditionEvaluator::GetDefinitionIfUnquoted( if(def && argument.WasQuoted() && this->Policy54Status == cmPolicies::WARN) { - bool hasBeenReported = this->Makefile.HasCMP0054AlreadyBeenReported( - this->Makefile.GetExecutionContext()); - - if(!hasBeenReported) + if(!this->Makefile.HasCMP0054AlreadyBeenReported()) { std::ostringstream e; e << (cmPolicies::GetPolicyWarning(cmPolicies::CMP0054)) << "\n"; @@ -161,10 +158,7 @@ bool cmConditionEvaluator::IsKeyword(std::string const& keyword, if(isKeyword && argument.WasQuoted() && this->Policy54Status == cmPolicies::WARN) { - bool hasBeenReported = this->Makefile.HasCMP0054AlreadyBeenReported( - this->Makefile.GetExecutionContext()); - - if(!hasBeenReported) + if(!this->Makefile.HasCMP0054AlreadyBeenReported()) { std::ostringstream e; e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0054) << "\n"; |