[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1135-g55357db

[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  55357db2cb883589969959fadc5dc66be3c383de (commit)
       via  cff2dc34f98fd0960a5ec1b37d9bf5f937c31efc (commit)
       via  5505bff7ae85b84fbdb60604de6bb4a515cd3e8a (commit)
      from  bd5323ebea446fcf077f3db21452c6ec0d36f1e5 (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=55357db2cb883589969959fadc5dc66be3c383de
commit 55357db2cb883589969959fadc5dc66be3c383de
Merge: bd5323e cff2dc3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 12:47:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 18 12:47:23 2015 -0400

    Merge topic 'minor-cleanups' into next
    
    cff2dc34 cmLocalUnixMakefileGenerator3: Port away from the Parent.
    5505bff7 cmMakefile: Add include which we use.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cff2dc34f98fd0960a5ec1b37d9bf5f937c31efc
commit cff2dc34f98fd0960a5ec1b37d9bf5f937c31efc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 18:43:17 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 18:43:17 2015 +0200

    cmLocalUnixMakefileGenerator3: Port away from the Parent.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 5d17a40..64f8bb8 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -256,7 +256,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
     return;
     }
   // always write the top makefile
-  if (this->Parent)
+  if (!this->GetMakefile()->IsRootMakefile())
     {
     ruleFileStream.SetCopyIfDifferent(true);
     }
@@ -267,7 +267,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
   // only write local targets unless at the top Keep track of targets already
   // listed.
   std::set<std::string> emittedTargets;
-  if (this->Parent)
+  if (!this->GetMakefile()->IsRootMakefile())
     {
     // write our targets, and while doing it collect up the object
     // file rules
@@ -888,7 +888,7 @@ void cmLocalUnixMakefileGenerator3
   std::vector<std::string> no_depends;
   std::vector<std::string> commands;
   commands.push_back(runRule);
-  if(this->Parent)
+  if(!this->GetMakefile()->IsRootMakefile())
     {
     this->CreateCDCommand(commands,
                           this->Makefile->GetHomeOutputDirectory(),

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5505bff7ae85b84fbdb60604de6bb4a515cd3e8a
commit 5505bff7ae85b84fbdb60604de6bb4a515cd3e8a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 18:40:36 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 18:40:36 2015 +0200

    cmMakefile: Add include which we use.
    
    Don't rely on this through the cmLocalGenerator include.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 07c2fd1..a4164ff 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -19,6 +19,7 @@
 #include "cmLocalGenerator.h"
 #include "cmCommands.h"
 #include "cmState.h"
+#include "cmOutputConverter.h"
 #include "cmFunctionBlocker.h"
 #include "cmListFileCache.h"
 #include "cmCommandArgumentParserHelper.h"

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    6 +++---
 Source/cmMakefile.cxx                    |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake