Merge topic 'reduce-policy-eval-scope'

cb19a63499 cmConditionEvaluator: Reduce the scope of the CMP0064 evaluation

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7287

Source/cmConditionEvaluator.cxx

@@ -531,9 +531,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)) {
 
@@ -625,7 +622,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(