[Cmake-commits] CMake branch, master, updated. v3.9.2-769-g7167686
Kitware Robot
kwrobot at kitware.com
Mon Sep 11 08:05:03 EDT 2017
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 71676863bcddc2a54c48c4a216308b34a18b1615 (commit)
via 1c9d3c0d32aebeac2f4e402df9a1e22c284d7f54 (commit)
via d371b52fdf4c5ccd5ceb87d30aa7d667dec5ae2a (commit)
via e48acfc501cec71337a6dbe04e9d61e9224fba6b (commit)
via 07a05079d366fad306117a99267b71141d3731b2 (commit)
from 28adf3833c23411dfce12b5be754ad53bc2b9b05 (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=71676863bcddc2a54c48c4a216308b34a18b1615
commit 71676863bcddc2a54c48c4a216308b34a18b1615
Merge: 1c9d3c0 d371b52
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 11 11:59:41 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Sep 11 08:00:03 2017 -0400
Merge topic 'find-openssl'
d371b52f FindOpenSSL: Search 'ssld' and 'crypod' for debug variants
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1246
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c9d3c0d32aebeac2f4e402df9a1e22c284d7f54
commit 1c9d3c0d32aebeac2f4e402df9a1e22c284d7f54
Merge: 28adf38 e48acfc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 11 11:55:37 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Sep 11 07:56:02 2017 -0400
Merge topic 'doc-find_dependency-return'
e48acfc5 CMakeFindDependencyMacro: Document return() behavior and caveats
07a05079 CMakeFindDependencyMacro: Convert documentation to bracket comment
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1245
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d371b52fdf4c5ccd5ceb87d30aa7d667dec5ae2a
commit d371b52fdf4c5ccd5ceb87d30aa7d667dec5ae2a
Author: Robert Dailey <rcdailey at gmail.com>
AuthorDate: Fri Sep 8 13:56:46 2017 -0500
Commit: Robert Dailey <rcdailey at gmail.com>
CommitDate: Fri Sep 8 13:57:55 2017 -0500
FindOpenSSL: Search 'ssld' and 'crypod' for debug variants
Release variant search already considered `ssl` and `crypto`, but
similarly named libs with `d` postfix were not searched for debug
variant.
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index f32eb50..0187e0d 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -149,6 +149,7 @@ if(WIN32 AND NOT CYGWIN)
libcryptod
libeay32${_OPENSSL_MSVC_RT_MODE}d
libeay32d
+ cryptod
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
@@ -176,6 +177,7 @@ if(WIN32 AND NOT CYGWIN)
libssld
ssleay32${_OPENSSL_MSVC_RT_MODE}d
ssleay32d
+ ssld
NAMES_PER_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e48acfc501cec71337a6dbe04e9d61e9224fba6b
commit e48acfc501cec71337a6dbe04e9d61e9224fba6b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 8 10:41:46 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 8 10:44:45 2017 -0400
CMakeFindDependencyMacro: Document return() behavior and caveats
The `find_dependency` macro is designed to be called from Package
Configuration Files, not from Find Modules. The return() behavior is
particularly problematic for find modules. Document this more clearly.
Issue: #17257
diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index 0ad4531..6a89fff 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -5,18 +5,29 @@
CMakeFindDependencyMacro
-------------------------
-::
+.. command:: find_dependency
+
+ The ``find_dependency()`` macro wraps a :command:`find_package` call for
+ a package dependency::
find_dependency(<dep> [...])
+ It is designed to be used in a
+ :ref:`Package Configuration File <Config File Packages>`
+ (``<package>Config.cmake``). ``find_dependency`` forwards the correct
+ parameters for ``QUIET`` and ``REQUIRED`` which were passed to
+ the original :command:`find_package` call. Any additional arguments
+ specified are forwarded to :command:`find_package`.
+
+ If the dependency could not be found it sets an informative diagnostic
+ message and calls :command:`return` to end processing of the calling
+ package configuration file and return to the :command:`find_package`
+ command that loaded it.
-``find_dependency()`` wraps a :command:`find_package` call for a package
-dependency. It is designed to be used in a <package>Config.cmake file, and it
-forwards the correct parameters for QUIET and REQUIRED which were passed to
-the original :command:`find_package` call. It also sets an informative
-diagnostic message if the dependency could not be found.
+ .. note::
-Any additional arguments specified are forwarded to :command:`find_package`.
+ The call to :command:`return` makes this macro unsuitable to call
+ from :ref:`Find Modules`.
#]=======================================================================]
macro(find_dependency dep)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07a05079d366fad306117a99267b71141d3731b2
commit 07a05079d366fad306117a99267b71141d3731b2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 8 10:30:24 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 8 10:30:24 2017 -0400
CMakeFindDependencyMacro: Convert documentation to bracket comment
diff --git a/Modules/CMakeFindDependencyMacro.cmake b/Modules/CMakeFindDependencyMacro.cmake
index 81606ce..0ad4531 100644
--- a/Modules/CMakeFindDependencyMacro.cmake
+++ b/Modules/CMakeFindDependencyMacro.cmake
@@ -1,23 +1,23 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
-#.rst:
-# CMakeFindDependencyMacro
-# -------------------------
-#
-# ::
-#
-# find_dependency(<dep> [...])
-#
-#
-# ``find_dependency()`` wraps a :command:`find_package` call for a package
-# dependency. It is designed to be used in a <package>Config.cmake file, and it
-# forwards the correct parameters for QUIET and REQUIRED which were passed to
-# the original :command:`find_package` call. It also sets an informative
-# diagnostic message if the dependency could not be found.
-#
-# Any additional arguments specified are forwarded to :command:`find_package`.
-#
+#[=======================================================================[.rst:
+CMakeFindDependencyMacro
+-------------------------
+
+::
+
+ find_dependency(<dep> [...])
+
+
+``find_dependency()`` wraps a :command:`find_package` call for a package
+dependency. It is designed to be used in a <package>Config.cmake file, and it
+forwards the correct parameters for QUIET and REQUIRED which were passed to
+the original :command:`find_package` call. It also sets an informative
+diagnostic message if the dependency could not be found.
+
+Any additional arguments specified are forwarded to :command:`find_package`.
+#]=======================================================================]
macro(find_dependency dep)
if (NOT ${dep}_FOUND)
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeFindDependencyMacro.cmake | 45 ++++++++++++++++++++------------
Modules/FindOpenSSL.cmake | 2 ++
2 files changed, 30 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list