[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2763-g78e86c7

[Ben Boeckel]

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  78e86c77e56d19660926006e72272ba813b77a69 (commit)
       via  60e4e38ce8b1e4a26b313043098a5af2dd9095a0 (commit)
      from  fa243d1f4129bf70cec3ef22f69df2f6e1189375 (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=78e86c77e56d19660926006e72272ba813b77a69
commit 78e86c77e56d19660926006e72272ba813b77a69
Merge: fa243d1 60e4e38
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon May 5 14:40:14 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 5 14:40:14 2014 -0400

    Merge topic 'dev/refactor-source-depends-in-ninja' into next
    
    60e4e38c LocalGenerator: explicitly overload AppendFlags


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60e4e38ce8b1e4a26b313043098a5af2dd9095a0
commit 60e4e38ce8b1e4a26b313043098a5af2dd9095a0
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon May 5 14:38:51 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon May 5 14:38:51 2014 -0400

    LocalGenerator: explicitly overload AppendFlags

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 98097b9..94e45e5 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -972,6 +972,13 @@ void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags,
 }
 
 //----------------------------------------------------------------------------
+void cmLocalUnixMakefileGenerator3::AppendFlags(std::string& flags,
+                                                const char* newFlags)
+{
+  this->cmLocalGenerator::AppendFlags(flags, newFlags);
+}
+
+//----------------------------------------------------------------------------
 void
 cmLocalUnixMakefileGenerator3
 ::AppendRuleDepend(std::vector<std::string>& depends,
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 0601245..4f2e4a0 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -169,7 +169,7 @@ public:
 
   // append flags to a string
   virtual void AppendFlags(std::string& flags, const std::string& newFlags);
-  using cmLocalGenerator::AppendFlags;
+  virtual void AppendFlags(std::string& flags, const char* newFlags);
 
   // append an echo command
   enum EchoColor { EchoNormal, EchoDepend, EchoBuild, EchoLink,

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |    7 +++++++
 Source/cmLocalUnixMakefileGenerator3.h   |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake