summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Turbov <i.zaufi@gmail.com>2021-07-27 20:09:18 (GMT)
committerBrad King <brad.king@kitware.com>2021-08-03 14:55:47 (GMT)
commit2a72cad9bec2e9bf2fafcde4e0affcf0a6afc96e (patch)
treec736c1af98874198e6b119f4964ed9bbe1391312
parent0dd77957063f07d5ab8dc8ddb7a56930c688d523 (diff)
downloadCMake-2a72cad9bec2e9bf2fafcde4e0affcf0a6afc96e.zip
CMake-2a72cad9bec2e9bf2fafcde4e0affcf0a6afc96e.tar.gz
CMake-2a72cad9bec2e9bf2fafcde4e0affcf0a6afc96e.tar.bz2
Style: Better names of local vars for `IN_LIST` handler
-rw-r--r--Source/cmConditionEvaluator.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index a239fcc..d55a89c 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -751,12 +751,14 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList& newArgs,
if (this->Policy57Status != cmPolicies::OLD &&
this->Policy57Status != cmPolicies::WARN) {
- cmProp def = this->GetVariableOrString(*args.current);
- cmProp def2 = this->Makefile.GetDefinition(args.nextnext->GetValue());
+ cmProp lhs = this->GetVariableOrString(*args.current);
+ cmProp rhs = this->Makefile.GetDefinition(args.nextnext->GetValue());
newArgs.ReduceTwoArgs(
- def2 && cm::contains(cmExpandedList(*def2, true), *def), args);
- } else if (this->Policy57Status == cmPolicies::WARN) {
+ rhs && cm::contains(cmExpandedList(*rhs, true), *lhs), args);
+ }
+
+ else if (this->Policy57Status == cmPolicies::WARN) {
std::ostringstream e;
e << cmPolicies::GetPolicyWarning(cmPolicies::CMP0057)
<< "\n"