Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 21:40:15 +08:00
Code Issues Projects Releases Wiki Activity

cmConditionEvaluator: Reduce the scope of the CMP0064 evaluation

Browse Source 
When evaluatig conditions, avoid testing CMP0064 unless it's really needed
(Cuz most of the time it doesn't)
This commit is contained in:
Alex Turbov
2022-05-23 13:46:23 +04:00
committed by Brad King
parent 9daa244e99
commit cb19a63499
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

@@ -526,9 +526,6 @@ bool cmConditionEvaluator::HandleLevel0(cmArgumentList& newArgs,
bool cmConditionEvaluator::HandleLevel1(cmArgumentList& newArgs, std::string&, bool cmConditionEvaluator::HandleLevel1(cmArgumentList& newArgs, std::string&,
MessageType&) MessageType&)
{ {
const auto policy64IsOld = this->Policy64Status == cmPolicies::OLD ||
this->Policy64Status == cmPolicies::WARN;
for (auto args = newArgs.make2ArgsIterator(); args.current != newArgs.end(); for (auto args = newArgs.make2ArgsIterator(); args.current != newArgs.end();
args.advance(newArgs)) { args.advance(newArgs)) {
@@ -617,7 +614,8 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList& newArgs, std::string&,
} }
// does a test exist // does a test exist
else if (this->IsKeyword(keyTEST, *args.current)) { else if (this->IsKeyword(keyTEST, *args.current)) {
if (policy64IsOld) { if (this->Policy64Status == cmPolicies::OLD ||
this->Policy64Status == cmPolicies::WARN) {
continue; continue;
} }
newArgs.ReduceOneArg(bool(this->Makefile.GetTest(args.next->GetValue())), newArgs.ReduceOneArg(bool(this->Makefile.GetTest(args.next->GetValue())),