[Cmake-commits] CMake branch, next, updated. v3.6.0-972-g48ce4c6

[Nils Gladitz]

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  48ce4c6d0c7b1b5bab33a4722a63d1116a22f84d (commit)
       via  a8bc5771cce91e8bb9ccff9aa82039dd60245ac3 (commit)
      from  fc0ef29399c7a03fc5ec11289826e9392a0bb803 (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=48ce4c6d0c7b1b5bab33a4722a63d1116a22f84d
commit 48ce4c6d0c7b1b5bab33a4722a63d1116a22f84d
Merge: fc0ef29 a8bc577
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Jul 22 02:41:09 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 22 02:41:09 2016 -0400

    Merge topic 'wix-disabled-components' into next
    
    a8bc5771 CPackComponent: Document the *_HIDDEN and *_DISABLED variables


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8bc5771cce91e8bb9ccff9aa82039dd60245ac3
commit a8bc5771cce91e8bb9ccff9aa82039dd60245ac3
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Jul 22 08:37:29 2016 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Jul 22 08:40:16 2016 +0200

    CPackComponent: Document the *_HIDDEN and *_DISABLED variables

diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake
index 6a33086..25d7d61 100644
--- a/Modules/CPackComponent.cmake
+++ b/Modules/CPackComponent.cmake
@@ -75,9 +75,17 @@
 #
 #  The dependencies (list of components) on which this component depends.
 #
+# .. variable:: CPACK_COMPONENT_<compName>_HIDDEN
+#
+#  True if this component is hidden from the user.
+#
 # .. variable:: CPACK_COMPONENT_<compName>_REQUIRED
 #
-#  True is this component is required.
+#  True if this component is required.
+#
+# .. variable:: CPACK_COMPONENT_<compName>_DISABLED
+#
+#  True if this component is not selected to be installed by default.
 #
 # .. command:: cpack_add_component
 #

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

Summary of changes:
 Modules/CPackComponent.cmake |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake