[Cmake-commits] CMake branch, next, updated. v3.2.2-2581-g86d8b40

[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  86d8b40eac87b4b62510761d0d05782cc880e4d3 (commit)
       via  aff70532bfd39f2e7073d40983506a13ec362410 (commit)
      from  6a6fae9caf7d70999db96e4317e62859a53dd5d4 (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=86d8b40eac87b4b62510761d0d05782cc880e4d3
commit 86d8b40eac87b4b62510761d0d05782cc880e4d3
Merge: 6a6fae9 aff7053
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 6 15:05:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 6 15:05:47 2015 -0400

    Merge topic 'refactor-cmLocalGenerator' into next
    
    aff70532 cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aff70532bfd39f2e7073d40983506a13ec362410
commit aff70532bfd39f2e7073d40983506a13ec362410
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 6 14:48:28 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 6 14:48:28 2015 -0400

    cmGlobalBorlandMakefileGenerator: Do not inherit from NMake generator
    
    The Borland generator re-implements every method the NMake generator
    does, so there is no reason to inherit this way.  Instead inherit
    directly from cmGlobalUnixMakefileGenerator3 like all the other
    makefile generators do.

diff --git a/Source/cmGlobalBorlandMakefileGenerator.h b/Source/cmGlobalBorlandMakefileGenerator.h
index 3f79414..4f24d2d 100644
--- a/Source/cmGlobalBorlandMakefileGenerator.h
+++ b/Source/cmGlobalBorlandMakefileGenerator.h
@@ -19,7 +19,7 @@
  *
  * cmGlobalBorlandMakefileGenerator manages nmake build process for a tree
  */
-class cmGlobalBorlandMakefileGenerator : public cmGlobalNMakeMakefileGenerator
+class cmGlobalBorlandMakefileGenerator : public cmGlobalUnixMakefileGenerator3
 {
 public:
   cmGlobalBorlandMakefileGenerator();

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

Summary of changes:
 Source/cmGlobalBorlandMakefileGenerator.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake