diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-07 19:42:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-07 19:42:17 (GMT) |
| commit | 5f9de609dd1d7a8e5063fcfb4ff69d98a8163f3f (patch) | |
| tree | 1032a81886996fe699af7396a285856eeb2f86cf | |
| parent | b61960564a5c3dce16e96281ec9e11ad90fe2d4b (diff) | |
| parent | cfae430133f80761812abcac34ed2c7e72c40037 (diff) | |
| download | CMake-5f9de609dd1d7a8e5063fcfb4ff69d98a8163f3f.zip CMake-5f9de609dd1d7a8e5063fcfb4ff69d98a8163f3f.tar.gz CMake-5f9de609dd1d7a8e5063fcfb4ff69d98a8163f3f.tar.bz2 | |
Merge topic 'rename-genex-method'
cfae430 Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation
| -rw-r--r-- | Source/cmGeneratorExpression.cxx | 6 | ||||
| -rw-r--r-- | Source/cmGeneratorExpression.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index d73c72c..97853f3 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -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); diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h index c20f130..bc0f6c2 100644 --- a/Source/cmGeneratorExpression.h +++ b/Source/cmGeneratorExpression.h @@ -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; |