summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2019-01-16 20:18:12 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-01-16 20:20:59 (GMT)
commit9e84e14db7e50925a3d7c3995737213d4d8b3921 (patch)
treed4fb166ddec90aefd98fc78315c4874a308e3901 /Help/manual
parentc59eae7ebc5423c2b06befd762f8639b0f23b7a0 (diff)
parent74dc68b4063193850c2d081139ca72355a39f5c5 (diff)
downloadCMake-9e84e14db7e50925a3d7c3995737213d4d8b3921.zip
CMake-9e84e14db7e50925a3d7c3995737213d4d8b3921.tar.gz
CMake-9e84e14db7e50925a3d7c3995737213d4d8b3921.tar.bz2
Merge topic 'qt_wrap_command_deprecations'
74dc68b406 qt_wrap_*: Add deprecation notes to command docs Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Merge-request: !2738
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-commands.7.rst11
1 files changed, 6 insertions, 5 deletions
diff --git a/Help/manual/cmake-commands.7.rst b/Help/manual/cmake-commands.7.rst
index ee13e40..a3bc465 100644
--- a/Help/manual/cmake-commands.7.rst
+++ b/Help/manual/cmake-commands.7.rst
@@ -100,8 +100,6 @@ These commands are available only in CMake projects.
/command/link_libraries
/command/load_cache
/command/project
- /command/qt_wrap_cpp
- /command/qt_wrap_ui
/command/remove_definitions
/command/set_source_files_properties
/command/set_target_properties
@@ -145,9 +143,10 @@ These commands are available only in CTest scripts.
Deprecated Commands
===================
-These commands are deprecated since CMake version 3.0.
-They are available only for backward compatibility.
-Do not use them in new code.
+These commands are deprecated and are only made available to maintain
+backward compatibility. The documentation of each command states the
+CMake version in which it was deprecated. Do not use these commands
+in new code.
.. toctree::
:maxdepth: 1
@@ -161,6 +160,8 @@ Do not use them in new code.
/command/load_command
/command/make_directory
/command/output_required_files
+ /command/qt_wrap_cpp
+ /command/qt_wrap_ui
/command/remove
/command/subdir_depends
/command/subdirs