[Cmake-commits] CMake branch, next, updated. v3.2.2-2901-gc584e64

[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  c584e645510a63d04c21d768c2ba9ebaa919e843 (commit)
       via  840c320123ef52838c7a63f17b890133f39dd7b2 (commit)
      from  394e783dec0bdad2e7c276d9d061370f0046989e (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=c584e645510a63d04c21d768c2ba9ebaa919e843
commit c584e645510a63d04c21d768c2ba9ebaa919e843
Merge: 394e783 840c320
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 13:26:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 18 13:26:20 2015 -0400

    Merge topic 'clean-up-makefile-generators' into next
    
    840c3201 fixup! cmGlobalUnixMakefileGenerator3: Host the PassMakeflags.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=840c320123ef52838c7a63f17b890133f39dd7b2
commit 840c320123ef52838c7a63f17b890133f39dd7b2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 18 13:23:07 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 18 13:23:07 2015 -0400

    fixup! cmGlobalUnixMakefileGenerator3: Host the PassMakeflags.

diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index 2ac136e..fe3321e 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -22,7 +22,6 @@ cmGlobalMSYSMakefileGenerator::cmGlobalMSYSMakefileGenerator()
   this->ToolSupportsColor = true;
   this->UseLinkScript = false;
   this->MSYSShell = true;
-  this->PassMakeflags = true;
 }
 
 std::string
diff --git a/Source/cmGlobalMinGWMakefileGenerator.cxx b/Source/cmGlobalMinGWMakefileGenerator.cxx
index e3ba2cd..17a7301 100644
--- a/Source/cmGlobalMinGWMakefileGenerator.cxx
+++ b/Source/cmGlobalMinGWMakefileGenerator.cxx
@@ -21,7 +21,6 @@ cmGlobalMinGWMakefileGenerator::cmGlobalMinGWMakefileGenerator()
   this->UseLinkScript = true;
   this->WindowsShell = true;
   this->MinGWMake = true;
-  this->PassMakeflags = true;
 }
 
 void cmGlobalMinGWMakefileGenerator
diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx
index 5b878de..062091f 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.cxx
+++ b/Source/cmGlobalWatcomWMakeGenerator.cxx
@@ -28,7 +28,6 @@ cmGlobalWatcomWMakeGenerator::cmGlobalWatcomWMakeGenerator()
   this->WatcomWMake = true;
   this->IncludeDirective = "!include";
   this->DefineWindowsNULL = true;
-  this->PassMakeflags = true;
   this->UnixCD = false;
   this->MakeSilentFlag = "-h";
 }

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

Summary of changes:
 Source/cmGlobalMSYSMakefileGenerator.cxx  |    1 -
 Source/cmGlobalMinGWMakefileGenerator.cxx |    1 -
 Source/cmGlobalWatcomWMakeGenerator.cxx   |    1 -
 3 files changed, 3 deletions(-)


hooks/post-receive
-- 
CMake