kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmConditionEvaluator: Drop unnecessary path conversion

Browse Source 
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.
This commit is contained in:
Brad King 2016-03-29 10:01:40 -04:00
parent 90f24f016e
commit 02fce523a1
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmConditionEvaluator.cxx
View File

@ -105,7 +105,7 @@ bool cmConditionEvaluator::IsTrue(
} }
cmListFileContext cmConditionEvaluator::GetConditionContext( cmListFileContext cmConditionEvaluator::GetConditionContext(
cmMakefile* mf, cmMakefile*,
const cmCommandContext& command, const cmCommandContext& command,
const std::string& filePath) const std::string& filePath)
{ {
@ -113,13 +113,6 @@ cmListFileContext cmConditionEvaluator::GetConditionContext(
cmListFileContext::FromCommandContext( cmListFileContext::FromCommandContext(
command, command,
filePath); filePath);
if(!mf->GetCMakeInstance()->GetIsInTryCompile())
{
cmOutputConverter converter(mf->GetStateSnapshot());
context.FilePath = converter.Convert(context.FilePath,
cmOutputConverter::HOME);
}
return context; return context;
} }