From f9785e0cb6c823849bb344e487d9e70d9fdaddb4 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 18 May 2015 21:39:15 +0200 Subject: cmMakefile: Simplify CMP0054 handling. --- Source/cmConditionEvaluator.cxx | 10 ++-------- Source/cmMakefile.cxx | 5 ++--- Source/cmMakefile.h | 3 +-- 3 files changed, 5 insertions(+), 13 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"; diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 4de3bcd..33b7a0b 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4941,10 +4941,9 @@ bool cmMakefile::SetPolicyVersion(const char *version) } //---------------------------------------------------------------------------- -bool cmMakefile::HasCMP0054AlreadyBeenReported( - cmListFileContext context) const +bool cmMakefile::HasCMP0054AlreadyBeenReported() const { - cmCMP0054Id id(context); + cmCMP0054Id id(this->GetExecutionContext()); bool alreadyReported = this->CMP0054ReportedIds.find(id) != this->CMP0054ReportedIds.end(); diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 5ef2ec9..3203b1b 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -411,8 +411,7 @@ public: * Determine if the given context, name pair has already been reported * in context of CMP0054. */ - bool HasCMP0054AlreadyBeenReported( - cmListFileContext context) const; + bool HasCMP0054AlreadyBeenReported() const; bool IgnoreErrorsCMP0061() const; -- cgit v0.12