diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-12 15:20:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-12 15:20:27 (GMT) |
| commit | 082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5 (patch) | |
| tree | 2ac04aad83ff546b3b607c6a1ba56fde6255532d /Help | |
| parent | c9a0b14153b87de34a651b1136971f9404fc362c (diff) | |
| parent | 3462118c6d700754e243492c3a65ef4ff26923f5 (diff) | |
| download | CMake-082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5.zip CMake-082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5.tar.gz CMake-082456e5a3ded411c6cbbdf9c3d3f6fb39fbc9c5.tar.bz2 | |
Merge topic 'codeblocks-nmake-makefiles-jom'
3462118c Allow CodeBlocks for NMake Makefiles JOM
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/generator/CodeBlocks.rst | 3 | ||||
| -rw-r--r-- | Help/release/dev/codeblocks-nmake-makefiles-jom.rst | 5 |
2 files changed, 8 insertions, 0 deletions
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`. |