[Cmake-commits] CMake branch, next, updated. v3.3.0-1419-gf00fb7f

[Brad King]

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  f00fb7f66f637f963529d4b717727921df85d904 (commit)
       via  e7d5c142c6ed1aca4eff85781bb03ebba8fb69bc (commit)
      from  2dc12b73833eabf125fa7f2613bf6822fe784468 (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=f00fb7f66f637f963529d4b717727921df85d904
commit f00fb7f66f637f963529d4b717727921df85d904
Merge: 2dc12b7 e7d5c14
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 27 11:49:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 27 11:49:17 2015 -0400

    Merge topic 'cmConditionEvaluator-minor-cleanup' into next
    
    e7d5c142 cmConditionEvaluator: Remove superfluous spaces in expressions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7d5c142c6ed1aca4eff85781bb03ebba8fb69bc
commit e7d5c142c6ed1aca4eff85781bb03ebba8fb69bc
Author:     Sebastian Schuberth <sschuberth at gmail.com>
AuthorDate: Mon Jul 27 16:58:54 2015 +0200
Commit:     Sebastian Schuberth <sschuberth at gmail.com>
CommitDate: Mon Jul 27 17:24:59 2015 +0200

    cmConditionEvaluator: Remove superfluous spaces in expressions

diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 61847d4..420bfdf 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -299,11 +299,11 @@ void cmConditionEvaluator::IncrementArguments(cmArgumentList &newArgs,
                         cmArgumentList::iterator &argP1,
                         cmArgumentList::iterator &argP2) const
 {
-  if (argP1  != newArgs.end())
+  if (argP1 != newArgs.end())
     {
     argP1++;
     argP2 = argP1;
-    if (argP1  != newArgs.end())
+    if (argP1 != newArgs.end())
       {
       argP2++;
       }
@@ -442,35 +442,35 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
       argP1 = arg;
       this->IncrementArguments(newArgs,argP1,argP2);
       // does a file exist
-      if (this->IsKeyword("EXISTS", *arg) && argP1  != newArgs.end())
+      if (this->IsKeyword("EXISTS", *arg) && argP1 != newArgs.end())
         {
         this->HandlePredicate(
           cmSystemTools::FileExists(argP1->c_str()),
           reducible, arg, newArgs, argP1, argP2);
         }
       // does a directory with this name exist
-      if (this->IsKeyword("IS_DIRECTORY", *arg) && argP1  != newArgs.end())
+      if (this->IsKeyword("IS_DIRECTORY", *arg) && argP1 != newArgs.end())
         {
         this->HandlePredicate(
           cmSystemTools::FileIsDirectory(argP1->c_str()),
           reducible, arg, newArgs, argP1, argP2);
         }
       // does a symlink with this name exist
-      if (this->IsKeyword("IS_SYMLINK", *arg) && argP1  != newArgs.end())
+      if (this->IsKeyword("IS_SYMLINK", *arg) && argP1 != newArgs.end())
         {
         this->HandlePredicate(
           cmSystemTools::FileIsSymlink(argP1->c_str()),
           reducible, arg, newArgs, argP1, argP2);
         }
       // is the given path an absolute path ?
-      if (this->IsKeyword("IS_ABSOLUTE", *arg) && argP1  != newArgs.end())
+      if (this->IsKeyword("IS_ABSOLUTE", *arg) && argP1 != newArgs.end())
         {
         this->HandlePredicate(
           cmSystemTools::FileIsFullPath(argP1->c_str()),
           reducible, arg, newArgs, argP1, argP2);
         }
       // does a command exist
-      if (this->IsKeyword("COMMAND", *arg) && argP1  != newArgs.end())
+      if (this->IsKeyword("COMMAND", *arg) && argP1 != newArgs.end())
         {
         cmCommand* command =
             this->Makefile.GetState()->GetCommand(argP1->c_str());
@@ -494,7 +494,7 @@ bool cmConditionEvaluator::HandleLevel1(cmArgumentList &newArgs,
           reducible, arg, newArgs, argP1, argP2);
         }
       // is a variable defined
-      if (this->IsKeyword("DEFINED", *arg) && argP1  != newArgs.end())
+      if (this->IsKeyword("DEFINED", *arg) && argP1 != newArgs.end())
         {
         size_t argP1len = argP1->GetValue().size();
         bool bdef = false;

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

Summary of changes:
 Source/cmConditionEvaluator.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake