[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2737-g0035ef1

[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  0035ef18b224c7f57efcf81e7185c62f8ad2bc9b (commit)
       via  9f3d548e9643b9720316852db5cedf5946ee98c9 (commit)
      from  e34674373ee21903143098bbf200928799751c32 (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=0035ef18b224c7f57efcf81e7185c62f8ad2bc9b
commit 0035ef18b224c7f57efcf81e7185c62f8ad2bc9b
Merge: e346743 9f3d548
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 14:47:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 2 14:47:28 2014 -0400

    Merge topic 'dev/refactor-source-depends-in-ninja' into next
    
    9f3d548e LocalGenerator: Fix -Woverload-virtual warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f3d548e9643b9720316852db5cedf5946ee98c9
commit 9f3d548e9643b9720316852db5cedf5946ee98c9
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri May 2 14:53:12 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri May 2 14:53:12 2014 -0400

    LocalGenerator: Fix -Woverload-virtual warning

diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index d089aba..27a76cd 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -169,6 +169,7 @@ public:
 
   // append flags to a string
   virtual void AppendFlags(std::string& flags, const std::string& newFlags);
+  using cmMakefile::AppendFlags;
 
   // append an echo command
   enum EchoColor { EchoNormal, EchoDepend, EchoBuild, EchoLink,

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.h |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake