[Cmake-commits] CMake branch, next, updated. v3.7.1-1915-g2d08b22

[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  2d08b225f78c13781887dc26ff3a3ce621394262 (commit)
       via  c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b (commit)
      from  73b458473d4bf8001037b9605543b03099d0c481 (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=2d08b225f78c13781887dc26ff3a3ce621394262
commit 2d08b225f78c13781887dc26ff3a3ce621394262
Merge: 73b4584 c6c976f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:46:30 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 9 16:46:30 2017 -0500

    Merge topic 'codeblocks-nmake-makefiles-jom' into next
    
    c6c976f2 Revert "Allow CodeBlocks for NMake Makefiles JOM"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b
commit c6c976f2c2a3e6503fff3bc77c9f7b8c61cd7e0b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 9 16:46:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 9 16:46:22 2017 -0500

    Revert "Allow CodeBlocks for NMake Makefiles JOM"
    
    This reverts commit 78c5db6a0ad90eec54958e06e7b9dcac9b6cc8ab.

diff --git a/Help/generator/CodeBlocks.rst b/Help/generator/CodeBlocks.rst
index d03cb0c..01798c7 100644
--- a/Help/generator/CodeBlocks.rst
+++ b/Help/generator/CodeBlocks.rst
@@ -18,9 +18,6 @@ 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 e42ce48..4c51af4 100644
--- a/Help/release/3.7.rst
+++ b/Help/release/3.7.rst
@@ -46,9 +46,6 @@ 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 bc81a6a..18c732d 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -49,7 +49,6 @@ 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
@@ -744,7 +743,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
   }
 
   std::string generator = this->GlobalGenerator->GetName();
-  if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") {
+  if (generator == "NMake Makefiles") {
     // 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, 1 insertion(+), 8 deletions(-)


hooks/post-receive
-- 
CMake