[Cmake-commits] CMake branch, next, updated. v2.8.6-1541-g64c1dcc

[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  64c1dcccf5c5dfb8a9c1c1bbdf30a205b13efd0d (commit)
       via  32f8437bbfc7141ba4ff9c6dd4311e67c25c2ad2 (commit)
      from  caf1edba845d6a4da73356a662452595cd504873 (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=64c1dcccf5c5dfb8a9c1c1bbdf30a205b13efd0d
commit 64c1dcccf5c5dfb8a9c1c1bbdf30a205b13efd0d
Merge: caf1edb 32f8437
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 10 09:51:58 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 10 09:51:58 2011 -0400

    Merge topic 'ninja-generator-prep' into next
    
    32f8437 Fix line-too-long style violations


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32f8437bbfc7141ba4ff9c6dd4311e67c25c2ad2
commit 32f8437bbfc7141ba4ff9c6dd4311e67c25c2ad2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 10 09:44:33 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 10 09:46:27 2011 -0400

    Fix line-too-long style violations
    
    Commit 8a0eb78f (Constify many getters of cmGlobalGenerator, 2011-03-26)
    added const qualifiers to many cmGlobalGenerator methods but left the
    resulting lines beyond our style's limit of 79 characters.

diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 96a326c..9f140a9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -220,7 +220,8 @@ public:
 
   /** Get the manifest of all targets that will be built for each
       configuration.  This is valid during generation only.  */
-  cmTargetManifest const& GetTargetManifest() const { return this->TargetManifest; }
+  cmTargetManifest const& GetTargetManifest() const
+  { return this->TargetManifest; }
 
   /** Get the content of a directory.  Directory listings are loaded
       from disk at most once and cached.  During the generation step
@@ -231,12 +232,12 @@ public:
 
   void AddTarget(cmTargets::value_type &v);
 
-  virtual const char* GetAllTargetName()           const { return "ALL_BUILD"; }
+  virtual const char* GetAllTargetName()         const { return "ALL_BUILD"; }
   virtual const char* GetInstallTargetName()       const { return "INSTALL"; }
   virtual const char* GetInstallLocalTargetName()  const { return 0; }
   virtual const char* GetInstallStripTargetName()  const { return 0; }
   virtual const char* GetPreinstallTargetName()    const { return 0; }
-  virtual const char* GetTestTargetName()          const { return "RUN_TESTS"; }
+  virtual const char* GetTestTargetName()        const { return "RUN_TESTS"; }
   virtual const char* GetPackageTargetName()       const { return "PACKAGE"; }
   virtual const char* GetPackageSourceTargetName() const { return 0; }
   virtual const char* GetEditCacheTargetName()     const { return 0; }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 7c6bbc2..481640b 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -136,18 +136,18 @@ protected:
   // does this generator need a requires step for any of its targets
   bool NeedRequiresStep(cmTarget const&);
 
-  // Setup target names
-  virtual const char* GetAllTargetName()           const { return "all"; }
-  virtual const char* GetInstallTargetName()       const { return "install"; }
-  virtual const char* GetInstallLocalTargetName()  const { return "install/local"; }
-  virtual const char* GetInstallStripTargetName()  const { return "install/strip"; }
-  virtual const char* GetPreinstallTargetName()    const { return "preinstall"; }
-  virtual const char* GetTestTargetName()          const { return "test"; }
-  virtual const char* GetPackageTargetName()       const { return "package"; }
-  virtual const char* GetPackageSourceTargetName() const { return "package_source"; }
-  virtual const char* GetEditCacheTargetName()     const { return "edit_cache"; }
-  virtual const char* GetRebuildCacheTargetName()  const { return "rebuild_cache"; }
-  virtual const char* GetCleanTargetName()         const { return "clean"; }
+  // Target name hooks for superclass.
+  const char* GetAllTargetName()           const { return "all"; }
+  const char* GetInstallTargetName()       const { return "install"; }
+  const char* GetInstallLocalTargetName()  const { return "install/local"; }
+  const char* GetInstallStripTargetName()  const { return "install/strip"; }
+  const char* GetPreinstallTargetName()    const { return "preinstall"; }
+  const char* GetTestTargetName()          const { return "test"; }
+  const char* GetPackageTargetName()       const { return "package"; }
+  const char* GetPackageSourceTargetName() const { return "package_source"; }
+  const char* GetEditCacheTargetName()     const { return "edit_cache"; }
+  const char* GetRebuildCacheTargetName()  const { return "rebuild_cache"; }
+  const char* GetCleanTargetName()         const { return "clean"; }
 
   virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() { return true; }
 

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

Summary of changes:
 Source/cmGlobalGenerator.h              |    7 ++++---
 Source/cmGlobalUnixMakefileGenerator3.h |   24 ++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake