[Cmake-commits] CMake branch, next, updated. v3.2.2-2855-gff6232c

[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  ff6232c9e2a43649daec4de8b10b0e22746f2d19 (commit)
       via  2f2288d9fd2de46815b05e839f0680b0dece2dee (commit)
      from  3b76090414c5fb960f738ee0cb7ede0e1a47e3ef (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=ff6232c9e2a43649daec4de8b10b0e22746f2d19
commit ff6232c9e2a43649daec4de8b10b0e22746f2d19
Merge: 3b76090 2f2288d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 07:44:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun May 17 07:44:38 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    2f2288d9 fixup! cmMakefile: Use early return to reduce nested code.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f2288d9fd2de46815b05e839f0680b0dece2dee
commit 2f2288d9fd2de46815b05e839f0680b0dece2dee
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 17 13:44:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun May 17 13:44:12 2015 +0200

    fixup! cmMakefile: Use early return to reduce nested code.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4ee0948..6fbddb7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -119,7 +119,7 @@ public:
     if(it == this->VarStack.rend())
       {
       cmLocalGenerator* plg = mf->GetLocalGenerator()->GetParent();
-      if(plg)
+      if(!plg)
         {
         return false;
         }

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

Summary of changes:
 Source/cmMakefile.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake