From cb19a634994aec41a070633e2b574bee4a5c5568 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Mon, 23 May 2022 13:46:23 +0400 Subject: cmConditionEvaluator: Reduce the scope of the CMP0064 evaluation When evaluatig conditions, avoid testing CMP0064 unless it's really needed (Cuz most of the time it doesn't) --- Source/cmConditionEvaluator.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 8e479c5..a8a196a 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -526,9 +526,6 @@ bool cmConditionEvaluator::HandleLevel0(cmArgumentList& newArgs, bool cmConditionEvaluator::HandleLevel1(cmArgumentList& newArgs, std::string&, MessageType&) { - const auto policy64IsOld = this->Policy64Status == cmPolicies::OLD || - this->Policy64Status == cmPolicies::WARN; - for (auto args = newArgs.make2ArgsIterator(); args.current != newArgs.end(); args.advance(newArgs)) { @@ -617,7 +614,8 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList& newArgs, std::string&, } // does a test exist else if (this->IsKeyword(keyTEST, *args.current)) { - if (policy64IsOld) { + if (this->Policy64Status == cmPolicies::OLD || + this->Policy64Status == cmPolicies::WARN) { continue; } newArgs.ReduceOneArg(bool(this->Makefile.GetTest(args.next->GetValue())), -- cgit v0.12