[Cmake-commits] CMake branch, next, updated. v3.7.1-2083-g6ec6ac2

[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  6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5 (commit)
       via  3462118c6d700754e243492c3a65ef4ff26923f5 (commit)
      from  ef155cf6403be058f878d046045e111a1bff41d8 (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=6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5
commit 6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5
Merge: ef155cf 3462118
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:48:11 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:48:11 2017 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3462118c6d700754e243492c3a65ef4ff26923f5
commit 3462118c6d700754e243492c3a65ef4ff26923f5
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Tue Jan 10 01:23:18 2017 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Tue Jan 10 19:26:21 2017 +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/dev/codeblocks-nmake-makefiles-jom.rst b/Help/release/dev/codeblocks-nmake-makefiles-jom.rst
new file mode 100644
index 0000000..f5612f0
--- /dev/null
+++ b/Help/release/dev/codeblocks-nmake-makefiles-jom.rst
@@ -0,0 +1,5 @@
+codeblocks-nmake-makefiles-jom
+------------------------------
+
+* The :generator:`CodeBlocks` now can generate with
+  :generator:`NMake Makefiles JOM`.
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index f544e8a..2dffcaa 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -48,6 +48,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
@@ -741,7 +742,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/dev/codeblocks-nmake-makefiles-jom.rst |    5 +++++
 Source/cmExtraCodeBlocksGenerator.cxx               |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/codeblocks-nmake-makefiles-jom.rst


hooks/post-receive
-- 
CMake