[Cmake-commits] CMake branch, master, updated. v3.13.0-rc2-208-g8a539e7
Kitware Robot
kwrobot at kitware.com
Fri Oct 26 09:45:04 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 8a539e7c2fefceefc53006e6be991c107e378a0c (commit)
via 216df68b32dbcc949109721dc2a1832f94195d67 (commit)
via 161054386345dd3c3b4817f1e2f3bca49162f487 (commit)
via 760c87c73c421329423b7669e00593aeb110c66d (commit)
from 6166384e3e279d9289c21e55ac124bf7b77c2355 (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=8a539e7c2fefceefc53006e6be991c107e378a0c
commit 8a539e7c2fefceefc53006e6be991c107e378a0c
Merge: 216df68 1610543
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 26 13:40:37 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 26 09:40:56 2018 -0400
Merge topic 'deprecation2'
1610543863 Use_wxWindows: Correct version of deprecation
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2532
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=216df68b32dbcc949109721dc2a1832f94195d67
commit 216df68b32dbcc949109721dc2a1832f94195d67
Merge: 6166384 760c87c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 26 13:40:02 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Oct 26 09:40:09 2018 -0400
Merge topic 'xref1'
760c87c73c Help: Back-reference from find_package() to "Find Modules"
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2531
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=161054386345dd3c3b4817f1e2f3bca49162f487
commit 161054386345dd3c3b4817f1e2f3bca49162f487
Author: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Fri Oct 26 09:38:55 2018 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 26 09:18:52 2018 -0400
Use_wxWindows: Correct version of deprecation
The deprecation note was added only recently, but the code
emitted a deprecation message since 2.8.9 or 2.8.10, from
what one can tell from the git history. This is now
documented as ".. deprecated:: 2.8.10".
diff --git a/Modules/Use_wxWindows.cmake b/Modules/Use_wxWindows.cmake
index a5e8879..782874c 100644
--- a/Modules/Use_wxWindows.cmake
+++ b/Modules/Use_wxWindows.cmake
@@ -5,7 +5,7 @@
Use_wxWindows
-------------
-.. deprecated:: 3.14
+.. deprecated:: 2.8.10
Use ``find_package(wxWidgets)`` and ``include(${wxWidgets_USE_FILE})`` instead.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=760c87c73c421329423b7669e00593aeb110c66d
commit 760c87c73c421329423b7669e00593aeb110c66d
Author: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
AuthorDate: Thu Oct 25 21:23:34 2018 +0200
Commit: Joachim Wuttke (o) <j.wuttke at fz-juelich.de>
CommitDate: Thu Oct 25 21:44:02 2018 +0200
Help: Back-reference from find_package() to "Find Modules"
viz., to section "Find Modules" in cmake-modules.7
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst
index 3ae9c2d..9395356 100644
--- a/Help/command/find_package.rst
+++ b/Help/command/find_package.rst
@@ -51,8 +51,9 @@ mode and "Config" mode. The above signature selects Module mode.
If no module is found the command falls back to Config mode, described
below. This fall back is disabled if the ``MODULE`` option is given.
-In Module mode, CMake searches for a file called ``Find<PackageName>.cmake``
-in the :variable:`CMAKE_MODULE_PATH` followed by the CMake installation.
+In Module mode, CMake searches for a file called ``Find<PackageName>.cmake``.
+The file is first searched in the :variable:`CMAKE_MODULE_PATH`,
+then among the :ref:`Find Modules` provided by the CMake installation.
If the file is found, it is read and processed by CMake. It is responsible
for finding the package, checking the version, and producing any needed
messages. Some find-modules provide limited or no support for versioning;
-----------------------------------------------------------------------
Summary of changes:
Help/command/find_package.rst | 5 +++--
Modules/Use_wxWindows.cmake | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list