reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-13 22:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'codeblocks-nmake-makefiles-jom'

Browse Source 
3462118c Allow CodeBlocks for NMake Makefiles JOM
This commit is contained in:
Brad King 2017-01-12 10:20:27 -05:00 committed by CMake Topic Stage
commit 082456e5a3
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Help/generator/CodeBlocks.rst
View File

@ -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
Help/release/dev/codeblocks-nmake-makefiles-jom.rst Normal file
View File

@ -0,0 +1,5 @@
codeblocks-nmake-makefiles-jom
------------------------------
* The :generator:`CodeBlocks` now can generate with
:generator:`NMake Makefiles JOM`.

3
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -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