[Cmake-commits] CMake branch, next, updated. v2.8.8-3522-g3825309

[Peter Kuemmel]

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  38253097c16a6a86f44fb39f3b1b9a3eb4460cd0 (commit)
       via  56aeac6e6424f54455850f54f6b71ae89f065fd3 (commit)
       via  7a6bc9e987b1f98529b5a43846eaa9fc7921f9da (commit)
      from  994670c6e879033e1c615a3991fd4e6b33c07489 (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=38253097c16a6a86f44fb39f3b1b9a3eb4460cd0
commit 38253097c16a6a86f44fb39f3b1b9a3eb4460cd0
Merge: 994670c 56aeac6
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Wed Jul 18 07:41:13 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 18 07:41:13 2012 -0400

    Merge topic 'ninja-fix-macosx' into next
    
    56aeac6 Ninja: fixes for bcc
    7a6bc9e Ninja: remove 'this' from member initializer list


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56aeac6e6424f54455850f54f6b71ae89f065fd3
commit 56aeac6e6424f54455850f54f6b71ae89f065fd3
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Wed Jul 18 13:39:14 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Wed Jul 18 13:39:14 2012 +0200

    Ninja: fixes for bcc

diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index 3ea524b..2798e54 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -51,6 +51,7 @@ public:
     { return this->ProgressFileNameFull; }
 
   cmTarget* GetTarget() { return this->Target;}
+
 protected:
 
   // create the file and directory etc
@@ -85,6 +86,7 @@ protected:
   private:
     cmMakefileTargetGenerator* Generator;
   };
+  friend struct MacOSXContentGeneratorType;
 
   // write the rules for an object
   void WriteObjectRuleFiles(cmSourceFile& source);
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index fb45837..84573ce 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -127,7 +127,7 @@ protected:
   private:
     cmNinjaTargetGenerator* Generator;
   };
-
+  friend struct MacOSXContentGeneratorType;
 
 protected:
   MacOSXContentGeneratorType* MacOSXContentGenerator;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a6bc9e987b1f98529b5a43846eaa9fc7921f9da
commit 7a6bc9e987b1f98529b5a43846eaa9fc7921f9da
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Wed Jul 18 13:11:27 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Wed Jul 18 13:11:27 2012 +0200

    Ninja: remove 'this' from member initializer list

diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index 7d8df59..42fad07 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -32,7 +32,7 @@ cmOSXBundleGenerator(cmTarget* target,
                      const char* configName)
  : Target(target)
  , Makefile(target->GetMakefile())
- , LocalGenerator(this->Makefile->GetLocalGenerator())
+ , LocalGenerator(Makefile->GetLocalGenerator())
  , TargetNameOut(targetNameOut)
  , ConfigName(configName)
  , MacContentDirectory()

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

Summary of changes:
 Source/cmMakefileTargetGenerator.h |    2 ++
 Source/cmNinjaTargetGenerator.h    |    2 +-
 Source/cmOSXBundleGenerator.cxx    |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake