diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-31 12:45:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-31 12:45:54 (GMT) |
| commit | 91d91d9d5da237d498549c7c0b6df0f4868e619a (patch) | |
| tree | cbe8dfab7353d1d6d2278c9f83f0df8ce1ceafa5 /Source/cmConditionEvaluator.cxx | |
| parent | e0917f29a42626d9351df3de7ddabfb4acc73c78 (diff) | |
| parent | 2379b3ae3171db7277fd3cf126b5b0c298231b83 (diff) | |
| download | CMake-91d91d9d5da237d498549c7c0b6df0f4868e619a.zip CMake-91d91d9d5da237d498549c7c0b6df0f4868e619a.tar.gz CMake-91d91d9d5da237d498549c7c0b6df0f4868e619a.tar.bz2 | |
Merge topic 'simplify-condition-context'
2379b3ae cmConditionEvaluator: Remove GetConditionContext method
02fce523 cmConditionEvaluator: Drop unnecessary path conversion
Diffstat (limited to 'Source/cmConditionEvaluator.cxx')
| -rw-r--r-- | Source/cmConditionEvaluator.cxx | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 6a0ebec..5d06f40 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -104,25 +104,6 @@ bool cmConditionEvaluator::IsTrue( 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( cmExpandedCommandArgument const& argument) const |