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

Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation

This commit is contained in:
Stephen Kelly 2013-02-28 12:04:23 +01:00
parent 549b95f115
commit cfae430133
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, cmTarget *currentTarget,
cmGeneratorExpressionDAGChecker *dagChecker) const cmGeneratorExpressionDAGChecker *dagChecker) const
{ {
if (!this->NeedsParsing) if (!this->NeedsEvaluation)
{ {
return this->Input.c_str(); return this->Input.c_str();
} }
@ -129,9 +129,9 @@ cmCompiledGeneratorExpression::cmCompiledGeneratorExpression(
cmGeneratorExpressionLexer l; cmGeneratorExpressionLexer l;
std::vector<cmGeneratorExpressionToken> tokens = std::vector<cmGeneratorExpressionToken> tokens =
l.Tokenize(this->Input.c_str()); l.Tokenize(this->Input.c_str());
this->NeedsParsing = l.GetSawGeneratorExpression(); this->NeedsEvaluation = l.GetSawGeneratorExpression();
if (this->NeedsParsing) if (this->NeedsEvaluation)
{ {
cmGeneratorExpressionParser p(tokens); cmGeneratorExpressionParser p(tokens);
p.Parse(this->Evaluators); p.Parse(this->Evaluators);

2
Source/cmGeneratorExpression.h
View File

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