[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4054-ga4bb7f4

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a4bb7f463a9b0ea19a27955b461d0a63f468fce9 (commit)
       via  cfae430133f80761812abcac34ed2c7e72c40037 (commit)
      from  d5a4fafbb52e4b31c4ae5daa601463e6a60487c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4bb7f463a9b0ea19a27955b461d0a63f468fce9
commit a4bb7f463a9b0ea19a27955b461d0a63f468fce9
Merge: d5a4faf cfae430
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 29 11:54:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 29 11:54:16 2013 -0400

    Merge topic 'rename-genex-method' into next
    
    cfae430 Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfae430133f80761812abcac34ed2c7e72c40037
commit cfae430133f80761812abcac34ed2c7e72c40037
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 28 12:04:23 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 29 17:53:31 2013 +0200

    Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index e962313..e5072de 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;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorExpression.cxx |    6 +++---
 Source/cmGeneratorExpression.h   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake