[Cmake-commits] CMake branch, next, updated. v2.8.6-1521-g7a1e8ec

[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  7a1e8ec3d8c8f1cbb06f9b1e08a210e733bf7f6c (commit)
       via  029ab3102e9aa21b4d3bc0471884e8c877bf5c9e (commit)
      from  87aaf03c37fe1f34292fcd0c45282eb4dc1ca1ca (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=7a1e8ec3d8c8f1cbb06f9b1e08a210e733bf7f6c
commit 7a1e8ec3d8c8f1cbb06f9b1e08a210e733bf7f6c
Merge: 87aaf03 029ab31
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 08:24:34 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 7 08:24:34 2011 -0400

    Merge topic 'ninja-generator-prep' into next
    
    029ab31 Constify XCode generator getters to match cmGlobalGenerator


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=029ab3102e9aa21b4d3bc0471884e8c877bf5c9e
commit 029ab3102e9aa21b4d3bc0471884e8c877bf5c9e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 08:22:05 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 7 08:22:05 2011 -0400

    Constify XCode generator getters to match cmGlobalGenerator
    
    Commit 8a0eb78f (Constify many getters of cmGlobalGenerator, 2011-03-26)
    added const qualifiers to many cmGlobalGenerator methods.  Fix the
    signature of the virtual function overrides in cmGlobalXCodeGenerator to
    match.

diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index fa55ff0..ed54be3 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -194,8 +194,8 @@ private:
   void AppendFlag(std::string& flags, std::string const& flag);
 
 protected:
-  virtual const char* GetInstallTargetName()      { return "install"; }
-  virtual const char* GetPackageTargetName()      { return "package"; }
+  virtual const char* GetInstallTargetName() const { return "install"; }
+  virtual const char* GetPackageTargetName() const { return "package"; }
 
   unsigned int XcodeVersion;
   std::string VersionString;

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake