diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-29 14:01:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-29 14:10:20 (GMT) |
| commit | 2379b3ae3171db7277fd3cf126b5b0c298231b83 (patch) | |
| tree | 889b59d85dbcfa8e81e20fa967523a17084af0ea /Source/cmIfCommand.cxx | |
| parent | 02fce523a13c8e4cda0c95334b480bb87336ed1c (diff) | |
| download | CMake-2379b3ae3171db7277fd3cf126b5b0c298231b83.zip CMake-2379b3ae3171db7277fd3cf126b5b0c298231b83.tar.gz CMake-2379b3ae3171db7277fd3cf126b5b0c298231b83.tar.bz2 | |
cmConditionEvaluator: Remove GetConditionContext method
All it does is call cmListFileContext::FromCommandContext, so move this
to the call sites.
Diffstat (limited to 'Source/cmIfCommand.cxx')
| -rw-r--r-- | Source/cmIfCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index 5964ef1..9a07dde 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -108,8 +108,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmake::MessageType messType; cmListFileContext conditionContext = - cmConditionEvaluator::GetConditionContext( - &mf, this->Functions[c], + cmListFileContext::FromCommandContext( + this->Functions[c], this->GetStartingContext().FilePath); cmConditionEvaluator conditionEvaluator( @@ -210,8 +210,8 @@ bool cmIfCommand commandContext.Name = execContext.Name; cmConditionEvaluator conditionEvaluator( - *(this->Makefile), cmConditionEvaluator::GetConditionContext( - this->Makefile, commandContext, execContext.FilePath), + *(this->Makefile), cmListFileContext::FromCommandContext( + commandContext, execContext.FilePath), this->Makefile->GetBacktrace()); bool isTrue = conditionEvaluator.IsTrue( |