[Cmake-commits] CMake branch, master, updated. v3.13.0-rc1-58-g5dd16bc
Kitware Robot
kwrobot at kitware.com
Wed Oct 10 08:55:03 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 5dd16bc92cd565cda4060879e1e27baac3a78baf (commit)
via dc372f6eef54f8a4b436cf631cbf621437076677 (commit)
via 846e3d2ceb0c8532e19425afc36455f0d4eedb14 (commit)
via c9cedd675b0023c21e5350d69b25df2156836800 (commit)
from f39bc297dbd5fbce2f547408e583f0e9a8205aef (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dd16bc92cd565cda4060879e1e27baac3a78baf
commit 5dd16bc92cd565cda4060879e1e27baac3a78baf
Merge: f39bc29 dc372f6
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Wed Oct 10 12:49:04 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 10 08:49:23 2018 -0400
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 at kitware.com>
Merge-request: !2463
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc372f6eef54f8a4b436cf631cbf621437076677
commit dc372f6eef54f8a4b436cf631cbf621437076677
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Tue Oct 9 22:54:46 2018 +1100
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Tue Oct 9 17:13:52 2018 +0200
Help: Document Use_wxWindows.cmake as deprecated
The implementation already logged a message saying that the module
was deprecated. This change adds that message to the module docs.
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 189e3be..af8e33f 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -268,6 +268,7 @@ Deprecated Utility Modules
/module/CMakeExpandImportedTargets
/module/CMakeForceCompiler
/module/TestCXXAcceptsFlag
+ /module/Use_wxWindows
/module/WriteBasicConfigVersionFile
Deprecated Find Modules
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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=846e3d2ceb0c8532e19425afc36455f0d4eedb14
commit 846e3d2ceb0c8532e19425afc36455f0d4eedb14
Author: Joachim Wuttke (l) <j.wuttke at fz-juelich.de>
AuthorDate: Mon Oct 8 21:42:09 2018 +0200
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Tue Oct 9 17:13:11 2018 +0200
Help: Reorganise module index into sections
* Split up module list into separate sections for utility modules
and find modules.
* Improve wording to explain how the different module types
are expected to be called/used.
* Move deprecated modules to their own separate sections.
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index b7276b6..189e3be 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -3,12 +3,14 @@
cmake-modules(7)
****************
-.. only:: html
+The modules listed here are part of the CMake distribution.
+Projects may provide further modules; their location(s)
+can be specified in the :variable:`CMAKE_MODULE_PATH` variable.
- .. contents::
+Utility Modules
+^^^^^^^^^^^^^^^
-All Modules
-===========
+These modules are loaded using the :command:`include` command.
.. toctree::
:maxdepth: 1
@@ -41,12 +43,9 @@ All Modules
/module/CMakeAddFortranSubdirectory
/module/CMakeBackwardCompatibilityCXX
/module/CMakeDependentOption
- /module/CMakeDetermineVSServicePack
- /module/CMakeExpandImportedTargets
/module/CMakeFindDependencyMacro
/module/CMakeFindFrameworks
/module/CMakeFindPackageMode
- /module/CMakeForceCompiler
/module/CMakeGraphVizOptions
/module/CMakePackageConfigHelpers
/module/CMakeParseArguments
@@ -70,6 +69,42 @@ All Modules
/module/ExternalProject
/module/FeatureSummary
/module/FetchContent
+ /module/FindPackageHandleStandardArgs
+ /module/FindPackageMessage
+ /module/FortranCInterface
+ /module/GenerateExportHeader
+ /module/GetPrerequisites
+ /module/GNUInstallDirs
+ /module/GoogleTest
+ /module/InstallRequiredSystemLibraries
+ /module/MacroAddFileDependencies
+ /module/ProcessorCount
+ /module/SelectLibraryConfigurations
+ /module/SquishTestScript
+ /module/TestBigEndian
+ /module/TestForANSIForScope
+ /module/TestForANSIStreamHeaders
+ /module/TestForSSTREAM
+ /module/TestForSTDNamespace
+ /module/UseEcos
+ /module/UseJavaClassFilelist
+ /module/UseJava
+ /module/UseJavaSymlinks
+ /module/UsePkgConfig
+ /module/UseSWIG
+ /module/UsewxWidgets
+ /module/Use_wxWindows
+ /module/WriteCompilerDetectionHeader
+
+Find Modules
+^^^^^^^^^^^^
+
+These modules search for third-party software.
+They are normally called through the :command:`find_package` command.
+
+.. toctree::
+ :maxdepth: 1
+
/module/FindALSA
/module/FindArmadillo
/module/FindASPELL
@@ -82,7 +117,6 @@ All Modules
/module/FindBZip2
/module/FindCABLE
/module/FindCoin3D
- /module/FindCUDA
/module/FindCups
/module/FindCURL
/module/FindCurses
@@ -173,8 +207,6 @@ All Modules
/module/FindosgViewer
/module/FindosgVolume
/module/FindosgWidget
- /module/FindPackageHandleStandardArgs
- /module/FindPackageMessage
/module/FindPatch
/module/FindPerlLibs
/module/FindPerl
@@ -189,8 +221,6 @@ All Modules
/module/FindPython
/module/FindPython2
/module/FindPython3
- /module/FindPythonInterp
- /module/FindPythonLibs
/module/FindQt3
/module/FindQt4
/module/FindQt
@@ -218,39 +248,38 @@ All Modules
/module/FindWget
/module/FindWish
/module/FindwxWidgets
- /module/FindwxWindows
/module/FindXCTest
/module/FindXalanC
/module/FindXercesC
/module/FindX11
/module/FindXMLRPC
/module/FindZLIB
- /module/FortranCInterface
- /module/GenerateExportHeader
- /module/GetPrerequisites
- /module/GNUInstallDirs
- /module/GoogleTest
- /module/InstallRequiredSystemLibraries
- /module/MacroAddFileDependencies
- /module/ProcessorCount
- /module/SelectLibraryConfigurations
- /module/SquishTestScript
- /module/TestBigEndian
+
+Deprecated Modules
+^^^^^^^^^^^^^^^^^^^
+
+Deprecated Utility Modules
+==========================
+
+.. toctree::
+ :maxdepth: 1
+
+ /module/CMakeDetermineVSServicePack
+ /module/CMakeExpandImportedTargets
+ /module/CMakeForceCompiler
/module/TestCXXAcceptsFlag
- /module/TestForANSIForScope
- /module/TestForANSIStreamHeaders
- /module/TestForSSTREAM
- /module/TestForSTDNamespace
- /module/UseEcos
- /module/UseJavaClassFilelist
- /module/UseJava
- /module/UseJavaSymlinks
- /module/UsePkgConfig
- /module/UseSWIG
- /module/UsewxWidgets
- /module/Use_wxWindows
/module/WriteBasicConfigVersionFile
- /module/WriteCompilerDetectionHeader
+
+Deprecated Find Modules
+=======================
+
+.. toctree::
+ :maxdepth: 1
+
+ /module/FindCUDA
+ /module/FindPythonInterp
+ /module/FindPythonLibs
+ /module/FindwxWindows
Legacy CPack Modules
====================
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9cedd675b0023c21e5350d69b25df2156836800
commit c9cedd675b0023c21e5350d69b25df2156836800
Author: Joachim Wuttke (l) <j.wuttke at fz-juelich.de>
AuthorDate: Tue Oct 9 08:42:13 2018 +0200
Commit: Craig Scott <craig.scott at crascit.com>
CommitDate: Tue Oct 9 22:41:44 2018 +1100
Help: Add link to cmake-qt(7) to FindQt.cmake.
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
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-modules.7.rst | 102 ++++++++++++++++++++++++++--------------
Modules/FindQt.cmake | 10 ++--
Modules/Use_wxWindows.cmake | 3 +-
3 files changed, 73 insertions(+), 42 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list