summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-11-15 15:39:48 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-11-15 15:39:55 (GMT)
commit59fc717c252fb6613b35ff3a7d2cf01e91ab6a69 (patch)
treeb3904080d14f5c4760c1996c89bcbc76e2e05e77 /Help/manual
parent64df9ef33a2f4eb9ef0cb17a2844308d9c7f7034 (diff)
parent0f5c1b404b0f9cbe652cf306e9dca0c25c70876f (diff)
downloadCMake-59fc717c252fb6613b35ff3a7d2cf01e91ab6a69.zip
CMake-59fc717c252fb6613b35ff3a7d2cf01e91ab6a69.tar.gz
CMake-59fc717c252fb6613b35ff3a7d2cf01e91ab6a69.tar.bz2
Merge topic 'deprecate-findqt'
0f5c1b404b find_package(): Add policy to remove the FindQt module Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: noo mook <noomook2519@gmail.com> Merge-request: !2554
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-modules.7.rst2
-rw-r--r--Help/manual/cmake-policies.7.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 57dcac2..cd5d1a5 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -221,7 +221,6 @@ They are normally called through the :command:`find_package` command.
/module/FindPython3
/module/FindQt3
/module/FindQt4
- /module/FindQt
/module/FindQuickTime
/module/FindRTI
/module/FindRuby
@@ -282,6 +281,7 @@ Deprecated Find Modules
/module/FindCUDA
/module/FindPythonInterp
/module/FindPythonLibs
+ /module/FindQt
/module/FindwxWindows
Legacy CPack Modules
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 98279ef..7c0fe6d 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -57,6 +57,7 @@ Policies Introduced by CMake 3.14
.. toctree::
:maxdepth: 1
+ CMP0084: The FindQt module does not exist for find_package(). </policy/CMP0084>
CMP0083: Add PIE options when linking executable. </policy/CMP0083>
CMP0082: Install rules from add_subdirectory() are interleaved with those in caller. </policy/CMP0082>