diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-25 13:34:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-25 13:34:53 (GMT) |
| commit | aaf3c5b32c9e75fb738fcc00228551f678db26d5 (patch) | |
| tree | b6fecd09f56323b4331f7a585dd75e127afb4578 /Help | |
| parent | 721647c8e58eb1f584414d008be8e1451895bcff (diff) | |
| parent | 551bd0b3e8ccd8c5cd8fff15a940797b8677a310 (diff) | |
| download | CMake-aaf3c5b32c9e75fb738fcc00228551f678db26d5.zip CMake-aaf3c5b32c9e75fb738fcc00228551f678db26d5.tar.gz CMake-aaf3c5b32c9e75fb738fcc00228551f678db26d5.tar.bz2 | |
Merge topic 'RemoveKDevelop3'
551bd0b3 Generators: adjust error message for the removed KDevelop3 generator
9198e6a2 Generators: remove KDevelop3 generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1688
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/generator/KDevelop3.rst | 25 | ||||
| -rw-r--r-- | Help/manual/cmake-generators.7.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/RemoveKDevelop3.rst | 4 | ||||
| -rw-r--r-- | Help/variable/CMAKE_EXTRA_GENERATOR.rst | 2 |
4 files changed, 5 insertions, 27 deletions
diff --git a/Help/generator/KDevelop3.rst b/Help/generator/KDevelop3.rst deleted file mode 100644 index eaa218b..0000000 --- a/Help/generator/KDevelop3.rst +++ /dev/null @@ -1,25 +0,0 @@ -KDevelop3 ---------- - -Generates KDevelop 3 project files. - -Project files for KDevelop 3 will be created in the top directory and -in every subdirectory which features a CMakeLists.txt file containing -a PROJECT() call. If you change the settings using KDevelop cmake -will try its best to keep your changes when regenerating the project -files. Additionally a hierarchy of UNIX makefiles is generated into -the build tree. Any standard UNIX-style make program can build the -project through the default make target. A "make install" target is -also provided. - -This "extra" generator may be specified as: - -``KDevelop3 - Unix Makefiles`` - Generate with :generator:`Unix Makefiles`. - -``KDevelop3`` - Generate with :generator:`Unix Makefiles`. - - For historical reasons this extra generator may be specified - directly as the main generator and it will be used as the - extra generator with :generator:`Unix Makefiles` automatically. diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst index a37c65b..0287767 100644 --- a/Help/manual/cmake-generators.7.rst +++ b/Help/manual/cmake-generators.7.rst @@ -108,6 +108,5 @@ The following extra generators are known to CMake. /generator/CodeBlocks /generator/CodeLite /generator/Eclipse CDT4 - /generator/KDevelop3 /generator/Kate /generator/Sublime Text 2 diff --git a/Help/release/dev/RemoveKDevelop3.rst b/Help/release/dev/RemoveKDevelop3.rst new file mode 100644 index 0000000..805ad26 --- /dev/null +++ b/Help/release/dev/RemoveKDevelop3.rst @@ -0,0 +1,4 @@ +RemoveKDevelop3 +--------------- + +* The ``KDevelop3`` generator has been removed. diff --git a/Help/variable/CMAKE_EXTRA_GENERATOR.rst b/Help/variable/CMAKE_EXTRA_GENERATOR.rst index 4d513e4..2c92323 100644 --- a/Help/variable/CMAKE_EXTRA_GENERATOR.rst +++ b/Help/variable/CMAKE_EXTRA_GENERATOR.rst @@ -4,7 +4,7 @@ CMAKE_EXTRA_GENERATOR The extra generator used to build the project. See :manual:`cmake-generators(7)`. -When using the Eclipse, CodeBlocks or KDevelop generators, CMake +When using the Eclipse, CodeBlocks, CodeLite, Kate or Sublime generators, CMake generates Makefiles (:variable:`CMAKE_GENERATOR`) and additionally project files for the respective IDE. This IDE project file generator is stored in ``CMAKE_EXTRA_GENERATOR`` (e.g. ``Eclipse CDT4``). |