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

Merge topic 'rename-genex-method' 

cfae430 Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation
This commit is contained in:
Brad King 2013-10-07 15:42:17 -04:00 committed by CMake Topic Stage
parent b61960564a cfae430133
commit 5f9de609dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGeneratorExpression.cxx
View File

@ -71,7 +71,7 @@ const char *cmCompiledGeneratorExpression::Evaluate(
cmTarget *currentTarget,
cmGeneratorExpressionDAGChecker *dagChecker) const
{
if (!this->NeedsParsing)
if (!this->NeedsEvaluation)
{
return this->Input.c_str();
}
@ -129,9 +129,9 @@ cmCompiledGeneratorExpression::cmCompiledGeneratorExpression(
cmGeneratorExpressionLexer l;
std::vector<cmGeneratorExpressionToken> tokens =
l.Tokenize(this->Input.c_str());
this->NeedsParsing = l.GetSawGeneratorExpression();
this->NeedsEvaluation = l.GetSawGeneratorExpression();
if (this->NeedsParsing)
if (this->NeedsEvaluation)
{
cmGeneratorExpressionParser p(tokens);
p.Parse(this->Evaluators);

2
Source/cmGeneratorExpression.h
View File

@ -126,7 +126,7 @@ private:
cmListFileBacktrace Backtrace;
std::vector<cmGeneratorExpressionEvaluator*> Evaluators;
const std::string Input;
bool NeedsParsing;
bool NeedsEvaluation;
mutable std::set<cmTarget*> DependTargets;
mutable std::set<cmTarget*> AllTargetsSeen;