mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'reduce-policy-eval-scope'

Browse Source 
cb19a63499 cmConditionEvaluator: Reduce the scope of the CMP0064 evaluation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7287
This commit is contained in:
Brad King
2022-05-24 14:08:46 +00:00
committed by Kitware Robot
parent 9eb81b2f9a cb19a63499
commit 5ceed2bb28
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmConditionEvaluator.cxx
View File

@@ -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(