|
@@ -218,7 +218,6 @@ cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile,
|
|
|
cmListFileBacktrace bt)
|
|
|
: Makefile(makefile)
|
|
|
, Backtrace(std::move(bt))
|
|
|
- , Policy57Status(makefile.GetPolicyStatus(cmPolicies::CMP0057))
|
|
|
, Policy64Status(makefile.GetPolicyStatus(cmPolicies::CMP0064))
|
|
|
, Policy139Status(makefile.GetPolicyStatus(cmPolicies::CMP0139))
|
|
|
{
|
|
@@ -665,29 +664,12 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList& newArgs,
|
|
|
}
|
|
|
|
|
|
else if (this->IsKeyword(keyIN_LIST, *args.next)) {
|
|
|
+ cmValue lhs = this->GetVariableOrString(*args.current);
|
|
|
+ cmValue rhs = this->Makefile.GetDefinition(args.nextnext->GetValue());
|
|
|
|
|
|
- if (this->Policy57Status != cmPolicies::OLD &&
|
|
|
- this->Policy57Status != cmPolicies::WARN) {
|
|
|
-
|
|
|
- cmValue lhs = this->GetVariableOrString(*args.current);
|
|
|
- cmValue rhs = this->Makefile.GetDefinition(args.nextnext->GetValue());
|
|
|
-
|
|
|
- newArgs.ReduceTwoArgs(
|
|
|
- rhs &&
|
|
|
- cm::contains(cmList{ *rhs, cmList::EmptyElements::Yes }, *lhs),
|
|
|
- args);
|
|
|
- }
|
|
|
-
|
|
|
- else if (this->Policy57Status == cmPolicies::WARN) {
|
|
|
- std::ostringstream e;
|
|
|
- e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0057)
|
|
|
- << "\n"
|
|
|
- "IN_LIST will be interpreted as an operator "
|
|
|
- "when the policy is set to NEW. "
|
|
|
- "Since the policy is not set the OLD behavior will be used.";
|
|
|
-
|
|
|
- this->Makefile.IssueMessage(MessageType::AUTHOR_WARNING, e.str());
|
|
|
- }
|
|
|
+ newArgs.ReduceTwoArgs(
|
|
|
+ rhs && cm::contains(cmList{ *rhs, cmList::EmptyElements::Yes }, *lhs),
|
|
|
+ args);
|
|
|
}
|
|
|
|
|
|
else if (this->IsKeyword(keyPATH_EQUAL, *args.next)) {
|