From 02fce523a13c8e4cda0c95334b480bb87336ed1c Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 29 Mar 2016 10:01:40 -0400 Subject: cmConditionEvaluator: Drop unnecessary path conversion In commit v3.4.0-rc2~1^2 (cmIfCommand: Issue CMP0054 warning with appropriate context, 2015-10-20) we added construction of a cmListFileContext with conversion of the calling file path. This code path runs on every condition (e.g. `if()`) and so the path conversion has a noticeable performance cost. Fortunately the only use of this context is for insertion into cmMakefile::CMP0054ReportedIds so we do not need to convert the path. Simply drop the conversion. --- Source/cmConditionEvaluator.cxx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 6a0ebec..4bfe697 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -105,7 +105,7 @@ bool cmConditionEvaluator::IsTrue( } cmListFileContext cmConditionEvaluator::GetConditionContext( - cmMakefile* mf, + cmMakefile*, const cmCommandContext& command, const std::string& filePath) { @@ -113,13 +113,6 @@ cmListFileContext cmConditionEvaluator::GetConditionContext( cmListFileContext::FromCommandContext( command, filePath); - - if(!mf->GetCMakeInstance()->GetIsInTryCompile()) - { - cmOutputConverter converter(mf->GetStateSnapshot()); - context.FilePath = converter.Convert(context.FilePath, - cmOutputConverter::HOME); - } return context; } -- cgit v0.12