summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/cmConditionEvaluator.cxx12
-rw-r--r--Source/cmConditionEvaluator.h3
-rw-r--r--Source/cmIfCommand.cxx8
-rw-r--r--Source/cmWhileCommand.cxx4
4 files changed, 6 insertions, 21 deletions
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 4bfe697..5d06f40 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -104,18 +104,6 @@ bool cmConditionEvaluator::IsTrue(
errorString, status, true);
}
-cmListFileContext cmConditionEvaluator::GetConditionContext(
- cmMakefile*,
- const cmCommandContext& command,
- const std::string& filePath)
-{
- cmListFileContext context =
- cmListFileContext::FromCommandContext(
- command,
- filePath);
- return context;
-}
-
//=========================================================================
const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
cmExpandedCommandArgument const& argument) const
diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h
index 8600825..3ed512d 100644
--- a/Source/cmConditionEvaluator.h
+++ b/Source/cmConditionEvaluator.h
@@ -33,9 +33,6 @@ public:
std::string &errorString,
cmake::MessageType &status);
- static cmListFileContext GetConditionContext(cmMakefile* mf,
- const cmCommandContext& command, std::string const& filePath);
-
private:
// Filter the given variable definition based on policy CMP0054.
const char* GetDefinitionIfUnquoted(
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(
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 4b7afd8..aabbe27 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -56,8 +56,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
commandContext.Name = execContext.Name;
cmListFileContext conditionContext =
- cmConditionEvaluator::GetConditionContext(
- &mf, commandContext,
+ cmListFileContext::FromCommandContext(
+ commandContext,
this->GetStartingContext().FilePath);
cmConditionEvaluator conditionEvaluator(