[Cmake-commits] CMake branch, next, updated. v3.2.2-2558-g6d2f594

[Stephen Kelly]

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  6d2f594648726880be490c95dba19167d0776182 (commit)
       via  d11003bc7ca3b39924d95ad6f116162501cab449 (commit)
      from  b270789a64407fdd7084b458e192ab0a7c4e945b (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=6d2f594648726880be490c95dba19167d0776182
commit 6d2f594648726880be490c95dba19167d0776182
Merge: b270789 d11003b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 5 17:24:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 5 17:24:29 2015 -0400

    Merge topic 'refactor-cmLocalGenerator' into next
    
    d11003bc fixup! cmGlobalGenerator: Move some flags from cmLocalGenerator.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d11003bc7ca3b39924d95ad6f116162501cab449
commit d11003bc7ca3b39924d95ad6f116162501cab449
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 5 23:24:15 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 5 23:24:15 2015 +0200

    fixup! cmGlobalGenerator: Move some flags from cmLocalGenerator.

diff --git a/Source/cmGlobalJOMMakefileGenerator.cxx b/Source/cmGlobalJOMMakefileGenerator.cxx
index f1f7984..25613eb 100644
--- a/Source/cmGlobalJOMMakefileGenerator.cxx
+++ b/Source/cmGlobalJOMMakefileGenerator.cxx
@@ -20,6 +20,7 @@ cmGlobalJOMMakefileGenerator::cmGlobalJOMMakefileGenerator()
   this->ToolSupportsColor = true;
   this->UseLinkScript = false;
   this->WindowsShell = true;
+  this->NMake = true;
 }
 
 void cmGlobalJOMMakefileGenerator
@@ -55,7 +56,6 @@ cmGlobalJOMMakefileGenerator::CreateLocalGenerator(cmLocalGenerator* parent)
   lg->SetMakeSilentFlag("/nologo");
   lg->SetIgnoreLibPrefix(true);
   lg->SetPassMakeflags(true);
-  lg->SetNMake(true);
   lg->SetUnixCD(false);
   return lg;
 }
diff --git a/Source/cmGlobalMSYSMakefileGenerator.cxx b/Source/cmGlobalMSYSMakefileGenerator.cxx
index 9f9e888..b6adcbb 100644
--- a/Source/cmGlobalMSYSMakefileGenerator.cxx
+++ b/Source/cmGlobalMSYSMakefileGenerator.cxx
@@ -21,7 +21,7 @@ cmGlobalMSYSMakefileGenerator::cmGlobalMSYSMakefileGenerator()
   this->ForceUnixPaths = true;
   this->ToolSupportsColor = true;
   this->UseLinkScript = false;
-  this->SetMSYSShell = true;
+  this->MSYSShell = true;
 }
 
 std::string

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

Summary of changes:
 Source/cmGlobalJOMMakefileGenerator.cxx  |    2 +-
 Source/cmGlobalMSYSMakefileGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake