[Cmake-commits] CMake branch, next, updated. v3.7.1-1877-gd0868c9

[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  d0868c9866d1bec94285c51bf2c6258e1c835223 (commit)
       via  78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab (commit)
      from  040e28be7c196697a103e19725d1c9ef392d2471 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0868c9866d1bec94285c51bf2c6258e1c835223
commit d0868c9866d1bec94285c51bf2c6258e1c835223
Merge: 040e28b 78c5db6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 4 08:05:59 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 4 08:05:59 2017 -0500

    Merge topic 'codeblocks-nmake-makefiles-jom' into next
    
    78c5db6a Allow CodeBlocks for NMake Makefiles JOM


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab
commit 78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Fri Dec 23 12:50:40 2016 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Fri Dec 23 12:50:40 2016 +0300

    Allow CodeBlocks for NMake Makefiles JOM

diff --git a/Help/generator/CodeBlocks.rst b/Help/generator/CodeBlocks.rst
index 01798c7..d03cb0c 100644
--- a/Help/generator/CodeBlocks.rst
+++ b/Help/generator/CodeBlocks.rst
@@ -18,6 +18,9 @@ This "extra" generator may be specified as:
 ``CodeBlocks - NMake Makefiles``
  Generate with :generator:`NMake Makefiles`.
 
+``CodeBlocks - NMake Makefiles JOM``
+ Generate with :generator:`NMake Makefiles JOM`.
+
 ``CodeBlocks - Ninja``
  Generate with :generator:`Ninja`.
 
diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst
index 4c51af4..e42ce48 100644
--- a/Help/release/3.7.rst
+++ b/Help/release/3.7.rst
@@ -46,6 +46,9 @@ Generators
   :variable:`CMAKE_CODELITE_USE_TARGETS` option
   to change project creation from projects to targets.
 
+* The :generator:`CodeBlocks` now can generate with
+  :generator:`NMake Makefiles JOM`.
+
 Commands
 --------
 
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 18c732d..bc81a6a 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -49,6 +49,7 @@ cmExtraCodeBlocksGenerator::GetFactory()
 #if defined(_WIN32)
     factory.AddSupportedGlobalGenerator("MinGW Makefiles");
     factory.AddSupportedGlobalGenerator("NMake Makefiles");
+    factory.AddSupportedGlobalGenerator("NMake Makefiles JOM");
 // disable until somebody actually tests it:
 // this->AddSupportedGlobalGenerator("MSYS Makefiles");
 #endif
@@ -743,7 +744,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
   }
 
   std::string generator = this->GlobalGenerator->GetName();
-  if (generator == "NMake Makefiles") {
+  if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") {
     // For Windows ConvertToOutputPath already adds quotes when required.
     // These need to be escaped, see
     // https://gitlab.kitware.com/cmake/cmake/issues/13952

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

Summary of changes:
 Help/generator/CodeBlocks.rst         |    3 +++
 Help/release/3.7.rst                  |    3 +++
 Source/cmExtraCodeBlocksGenerator.cxx |    3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake