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

Merge topic 'simplify-condition-context' 

2379b3ae cmConditionEvaluator: Remove GetConditionContext method
02fce523 cmConditionEvaluator: Drop unnecessary path conversion
This commit is contained in:
Brad King 2016-03-31 08:45:54 -04:00 committed by CMake Topic Stage
parent e0917f29a4 2379b3ae31
commit 91d91d9d5d
4 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmConditionEvaluator.cxx
View File

@ -104,25 +104,6 @@ bool cmConditionEvaluator::IsTrue(
errorString, status, true); errorString, status, true);
} }
cmListFileContext cmConditionEvaluator::GetConditionContext(
cmMakefile* mf,
const cmCommandContext& command,
const std::string& filePath)
{
cmListFileContext context =
cmListFileContext::FromCommandContext(
command,
filePath);
if(!mf->GetCMakeInstance()->GetIsInTryCompile())
{
cmOutputConverter converter(mf->GetStateSnapshot());
context.FilePath = converter.Convert(context.FilePath,
cmOutputConverter::HOME);
}
return context;
}
//========================================================================= //=========================================================================
const char* cmConditionEvaluator::GetDefinitionIfUnquoted( const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
cmExpandedCommandArgument const& argument) const cmExpandedCommandArgument const& argument) const

3
Source/cmConditionEvaluator.h
View File

@ -33,9 +33,6 @@ public:
std::string &errorString, std::string &errorString,
cmake::MessageType &status); cmake::MessageType &status);
static cmListFileContext GetConditionContext(cmMakefile* mf,
const cmCommandContext& command, std::string const& filePath);
private: private:
// Filter the given variable definition based on policy CMP0054. // Filter the given variable definition based on policy CMP0054.
const char* GetDefinitionIfUnquoted( const char* GetDefinitionIfUnquoted(

8
Source/cmIfCommand.cxx
View File

@ -108,8 +108,8 @@ IsFunctionBlocked(const cmListFileFunction& lff,
cmake::MessageType messType; cmake::MessageType messType;
cmListFileContext conditionContext = cmListFileContext conditionContext =
cmConditionEvaluator::GetConditionContext( cmListFileContext::FromCommandContext(
&mf, this->Functions[c], this->Functions[c],
this->GetStartingContext().FilePath); this->GetStartingContext().FilePath);
cmConditionEvaluator conditionEvaluator( cmConditionEvaluator conditionEvaluator(
@ -210,8 +210,8 @@ bool cmIfCommand
commandContext.Name = execContext.Name; commandContext.Name = execContext.Name;
cmConditionEvaluator conditionEvaluator( cmConditionEvaluator conditionEvaluator(
*(this->Makefile), cmConditionEvaluator::GetConditionContext( *(this->Makefile), cmListFileContext::FromCommandContext(
this->Makefile, commandContext, execContext.FilePath), commandContext, execContext.FilePath),
this->Makefile->GetBacktrace()); this->Makefile->GetBacktrace());
bool isTrue = conditionEvaluator.IsTrue( bool isTrue = conditionEvaluator.IsTrue(

4
Source/cmWhileCommand.cxx
View File

@ -56,8 +56,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
commandContext.Name = execContext.Name; commandContext.Name = execContext.Name;
cmListFileContext conditionContext = cmListFileContext conditionContext =
cmConditionEvaluator::GetConditionContext( cmListFileContext::FromCommandContext(
&mf, commandContext, commandContext,
this->GetStartingContext().FilePath); this->GetStartingContext().FilePath);
cmConditionEvaluator conditionEvaluator( cmConditionEvaluator conditionEvaluator(