[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-880-g66b673c

[Brad King]

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  66b673c375019df62a1bbbd1a4e8c068fbae9449 (commit)
       via  4ab3b0c462d45080ec31e5e1e7dbfa1c0ab886bf (commit)
       via  e6460e7d40a0146d6580d41da17f64370ce9a092 (commit)
      from  3b3b59681cfeea332fb0f48f796f222586e2ee99 (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=66b673c375019df62a1bbbd1a4e8c068fbae9449
commit 66b673c375019df62a1bbbd1a4e8c068fbae9449
Merge: 3b3b596 4ab3b0c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 2 08:43:34 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 2 08:43:34 2016 -0400

    Merge topic 'cpack-doc-typos' into next
    
    4ab3b0c4 CPackRPM: Fix incorrect variable name in documentation
    e6460e7d CPackDeb: Fix incorrect variable name in documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ab3b0c462d45080ec31e5e1e7dbfa1c0ab886bf
commit 4ab3b0c462d45080ec31e5e1e7dbfa1c0ab886bf
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Wed Nov 2 16:53:55 2016 +0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 2 08:42:56 2016 -0400

    CPackRPM: Fix incorrect variable name in documentation
    
    `CPACK_RPM_COMPONENT_INSTALL` is the correct variable to set to enable
    component packaging.  `CPACK_RPM_PACKAGE_COMPONENT` is just set to a
    component name when CPack calls corresponding installer.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 15b62c7..0640630 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -45,7 +45,7 @@
 #
 # List of CPackRPM specific variables:
 #
-# .. variable:: CPACK_RPM_PACKAGE_COMPONENT
+# .. variable:: CPACK_RPM_COMPONENT_INSTALL
 #
 #  Enable component packaging for CPackRPM
 #
@@ -461,7 +461,7 @@
 #  May be used to embed a pre (un)installation script in the spec file.
 #  The referred script file (or both) will be read and directly
 #  put after the ``%pre`` or ``%preun`` section
-#  If :variable:`CPACK_RPM_PACKAGE_COMPONENT` is set to ON the (un)install
+#  If :variable:`CPACK_RPM_COMPONENT_INSTALL` is set to ON the (un)install
 #  script for each component can be overridden with
 #  ``CPACK_RPM_<COMPONENT>_PRE_INSTALL_SCRIPT_FILE`` and
 #  ``CPACK_RPM_<COMPONENT>_PRE_UNINSTALL_SCRIPT_FILE``.
@@ -480,7 +480,7 @@
 #  May be used to embed a post (un)installation script in the spec file.
 #  The referred script file (or both) will be read and directly
 #  put after the ``%post`` or ``%postun`` section.
-#  If :variable:`CPACK_RPM_PACKAGE_COMPONENT` is set to ON the (un)install
+#  If :variable:`CPACK_RPM_COMPONENT_INSTALL` is set to ON the (un)install
 #  script for each component can be overridden with
 #  ``CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE`` and
 #  ``CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE``.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6460e7d40a0146d6580d41da17f64370ce9a092
commit e6460e7d40a0146d6580d41da17f64370ce9a092
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Wed Nov 2 16:53:55 2016 +0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 2 08:42:44 2016 -0400

    CPackDeb: Fix incorrect variable name in documentation
    
    `CPACK_DEB_COMPONENT_INSTALL` is the correct variable to set to enable
    component packaging.  `CPACK_DEB_PACKAGE_COMPONENT` is just set to a
    component name when CPack calls corresponding installer.

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 4a7a6b8..909a12b 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -34,7 +34,7 @@
 #
 # List of CPackDEB specific variables:
 #
-# .. variable:: CPACK_DEB_PACKAGE_COMPONENT
+# .. variable:: CPACK_DEB_COMPONENT_INSTALL
 #
 #  Enable component packaging for CPackDEB
 #

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

Summary of changes:
 Modules/CPackDeb.cmake |    2 +-
 Modules/CPackRPM.cmake |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake