[Cmake-commits] CMake branch, next, updated. v3.7.2-1315-gdf2ae6c

Brad King brad.king at kitware.com
Mon Feb 6 14:36:05 EST 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, next has been updated
       via  df2ae6c84e8917c77cdf66182944e7b85fdce651 (commit)
       via  6cffc98ca0625d0f5db1c34e59b9271416bc212e (commit)
      from  97528f337a23106f8475fa7bd2d2345b8358fee5 (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=df2ae6c84e8917c77cdf66182944e7b85fdce651
commit df2ae6c84e8917c77cdf66182944e7b85fdce651
Merge: 97528f3 6cffc98
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 6 14:36:04 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 6 14:36:04 2017 -0500

    Merge topic 'FeatureSummary-doc-cleanup' into next
    
    6cffc98c FeatureSummary: Fix documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cffc98ca0625d0f5db1c34e59b9271416bc212e
commit 6cffc98ca0625d0f5db1c34e59b9271416bc212e
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Fri Feb 3 15:29:08 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 6 14:35:30 2017 -0500

    FeatureSummary: Fix documentation

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 8910be7..f29a5f0 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -44,7 +44,7 @@ The global property :variable:`FeatureSummary_REQUIRED_PKG_TYPES` defines which
 package types are required.
 
 If one or more package in this categories has not been found, CMake will abort
-when calling :cmd;`feature_summary` with the
+when calling :command:`feature_summary` with the
 'FATAL_ON_MISSING_REQUIRED_PACKAGES' option enabled.
 
 The default value for this global property is ``REQUIRED``.
@@ -54,7 +54,7 @@ The default value for this global property is ``REQUIRED``.
 
 The global property :variable:`FeatureSummary_DEFAULT_PKG_TYPE` defines which
 package type is the default one.
-When calling :cmd;`feature_summary`, if the user did not set the package type
+When calling :command:`feature_summary`, if the user did not set the package type
 explicitly, the package will be assigned to this category.
 
 This value must be one of the types defined in the
@@ -196,9 +196,11 @@ endfunction()
                      [VAR <variable_name>]
                      [INCLUDE_QUIET_PACKAGES]
                      [FATAL_ON_MISSING_REQUIRED_PACKAGES]
-                     [DESCRIPTION "Found packages:"]
+                     [DESCRIPTION "<description>"]
                      [QUIET_ON_EMPTY]
-                     WHAT (ALL | PACKAGES_FOUND | PACKAGES_NOT_FOUND
+                     WHAT (ALL
+                          | PACKAGES_FOUND | PACKAGES_NOT_FOUND
+                          | <TYPE>_PACKAGES_FOUND | <TYPE>_PACKAGES_NOT_FOUND
                           | ENABLED_FEATURES | DISABLED_FEATURES)
                    )
 
@@ -245,10 +247,10 @@ endfunction()
   information is "printed" into the specified variable.  If ``FILENAME`` is
   not used, the information is printed to the terminal.  Using the
   ``DESCRIPTION`` option a description or headline can be set which will be
-  printed above the actual content.  If ``INCLUDE_QUIET_PACKAGES`` is given,
-  packages which have been searched with ``find_package(... QUIET)`` will
-  also be listed.  By default they are skipped.  If
-  ``FATAL_ON_MISSING_REQUIRED_PACKAGES`` is given, CMake will abort if a
+  printed above the actual content.
+  If ``INCLUDE_QUIET_PACKAGES`` is given, packages which have been searched with
+  ``find_package(... QUIET)`` will also be listed. By default they are skipped.
+  If ``FATAL_ON_MISSING_REQUIRED_PACKAGES`` is given, CMake will abort if a
   package which is marked as one of the package types listed in the
   :variable:`FeatureSummary_REQUIRED_PKG_TYPES` global property has not been
   found.

-----------------------------------------------------------------------

Summary of changes:
 Modules/FeatureSummary.cmake |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list