Browse Source

Allow CodeBlocks for NMake Makefiles JOM

Konstantin Podsvirov 9 years ago
parent
commit
3462118c6d

+ 3 - 0
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`.
 

+ 5 - 0
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`.

+ 2 - 1
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