diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-10-10 12:49:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-10 12:49:23 (GMT) |
| commit | 5dd16bc92cd565cda4060879e1e27baac3a78baf (patch) | |
| tree | dca89cc4e39385474b12ee6a602ccad00add62bd /Modules | |
| parent | f39bc297dbd5fbce2f547408e583f0e9a8205aef (diff) | |
| parent | dc372f6eef54f8a4b436cf631cbf621437076677 (diff) | |
| download | CMake-5dd16bc92cd565cda4060879e1e27baac3a78baf.zip CMake-5dd16bc92cd565cda4060879e1e27baac3a78baf.tar.gz CMake-5dd16bc92cd565cda4060879e1e27baac3a78baf.tar.bz2 | |
Merge topic 'module-index-restructure'
dc372f6eef Help: Document Use_wxWindows.cmake as deprecated
846e3d2ceb Help: Reorganise module index into sections
c9cedd675b Help: Add link to cmake-qt(7) to FindQt.cmake.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2463
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt.cmake | 10 | ||||
| -rw-r--r-- | Modules/Use_wxWindows.cmake | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 68dfa7d..4dff7c3 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -5,9 +5,12 @@ # FindQt # ------ # -# Searches for all installed versions of Qt. +# Searches for all installed versions of Qt3 or Qt4. # -# This should only be used if your project can work with multiple +# This module cannot handle Qt5 or any later versions. +# For those, see :manual:`cmake-qt(7)`. +# +# This module should only be used if your project can work with multiple # versions of Qt. If not, you should just directly use FindQt4 or # FindQt3. If multiple versions of Qt are found on the machine, then # The user must set the option DESIRED_QT_VERSION to the version they @@ -16,9 +19,6 @@ # or FindQt4 module is included. Once the user sets DESIRED_QT_VERSION, # then the FindQt3 or FindQt4 module is included. # -# This module can only detect and switch between Qt versions 3 and 4. It -# cannot handle Qt5 or any later versions. -# # :: # # QT_REQUIRED if this is set to TRUE then if CMake can diff --git a/Modules/Use_wxWindows.cmake b/Modules/Use_wxWindows.cmake index bd8cc01..7cdd92e 100644 --- a/Modules/Use_wxWindows.cmake +++ b/Modules/Use_wxWindows.cmake @@ -5,7 +5,8 @@ # Use_wxWindows # ------------- # -# +# Deprecated. Use ``find_package(wxWidgets)`` and +# ``include(${wxWidgets_USE_FILE})`` instead. # # # This convenience include finds if wxWindows is installed and set the |