summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-14 14:31:44 (GMT)
committerBrad King <brad.king@kitware.com>2016-04-15 12:29:42 (GMT)
commit7503deb2c55a32f72c9ec34f17a800d4ab1e4c75 (patch)
treed1650d69bcb0cdb52c345448119ed7b3deb2ec4f
parentf5da19edd00e05eb39332fe416f0b2bb77abadaa (diff)
downloadCMake-7503deb2c55a32f72c9ec34f17a800d4ab1e4c75.zip
CMake-7503deb2c55a32f72c9ec34f17a800d4ab1e4c75.tar.gz
CMake-7503deb2c55a32f72c9ec34f17a800d4ab1e4c75.tar.bz2
cmIfCommand: Simplify execution context construction
-rw-r--r--Source/cmIfCommand.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 9a07dde..fc54ca5 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -203,15 +203,9 @@ bool cmIfCommand
cmake::MessageType status;
- cmListFileContext execContext = this->Makefile->GetExecutionContext();
-
- cmCommandContext commandContext;
- commandContext.Line = execContext.Line;
- commandContext.Name = execContext.Name;
-
cmConditionEvaluator conditionEvaluator(
- *(this->Makefile), cmListFileContext::FromCommandContext(
- commandContext, execContext.FilePath),
+ *(this->Makefile),
+ this->Makefile->GetExecutionContext(),
this->Makefile->GetBacktrace());
bool isTrue = conditionEvaluator.IsTrue(