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 2fdaa209e13e01fff7186d55c1f11901262534b4 (commit) via 285d4d0a88b83e8ea46d315ed6d60c954e26e661 (commit) from e4bfebdd3f8433b47c265020ab042ebe639765fd (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=2fdaa209e13e01fff7186d55c1f11901262534b4 commit 2fdaa209e13e01fff7186d55c1f11901262534b4 Merge: e4bfebd 285d4d0 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 17:26:23 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue May 31 17:26:23 2016 -0400 Merge topic 'cpack-documentation-improvements' into next 285d4d0a fixup! CPackRPM and CPackDeb documentation improvements https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=285d4d0a88b83e8ea46d315ed6d60c954e26e661 commit 285d4d0a88b83e8ea46d315ed6d60c954e26e661 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Tue May 31 23:25:59 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Tue May 31 23:25:59 2016 +0200 fixup! CPackRPM and CPackDeb documentation improvements diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 300d710..c9678d6 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -31,6 +31,16 @@ # # List of CPackRPM specific variables: # +# .. variable:: CPACK_DEB_PACKAGE_COMPONENT +# +# Enable component packaging for CPackRPM +# +# * Mandatory : NO +# * Default : OFF +# +# If enabled (ON) multiple packages are generated. By default a single package +# containing files of all components is generated. +# # .. variable:: CPACK_DEBIAN_PACKAGE_NAME # CPACK_DEBIAN_<COMPONENT>_PACKAGE_NAME # diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 8c51b45..d231ff0 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -42,6 +42,16 @@ # # List of CPackRPM specific variables: # +# .. variable:: CPACK_RPM_PACKAGE_COMPONENT +# +# Enable component packaging for CPackRPM +# +# * Mandatory : NO +# * Default : OFF +# +# If enabled (ON) multiple packages are generated. By default a single package +# containing files of all components is generated. +# # .. variable:: CPACK_RPM_PACKAGE_SUMMARY # CPACK_RPM_<component>_PACKAGE_SUMMARY # @@ -410,6 +420,7 @@ # cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM # # .. variable:: CPACK_RPM_USER_BINARY_SPECFILE +# CPACK_RPM_<componentName>_USER_BINARY_SPECFILE # # A user provided spec file. # @@ -419,8 +430,6 @@ # May be set by the user in order to specify a USER binary spec file # to be used by CPackRPM instead of generating the file. # The specified file will be processed by configure_file( @ONLY). -# One can provide a component specific file by setting -# :variable:`CPACK_RPM_<componentName>_USER_BINARY_SPECFILE`. # # .. variable:: CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE # @@ -449,7 +458,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_COMPONENT_INSTALL` is set to ON the (un)install +# If :variable:`CPACK_RPM_PACKAGE_COMPONENT` 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``. @@ -468,7 +477,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_COMPONENT_INSTALL` is set to ON the (un)install +# If :variable:`CPACK_RPM_PACKAGE_COMPONENT` 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``. ----------------------------------------------------------------------- Summary of changes: Modules/CPackDeb.cmake | 10 ++++++++++ Modules/CPackRPM.cmake | 17 +++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits