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 d975bf0ecbf8e10f745585f82397f07aa161fdf9 (commit)
via e9985b3c34609f1385123768f9bb44ce314d51b8 (commit)
from b13304569f05d26976ab92a973e000a3eda1a3f5 (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=d975bf0ecbf8e10f745585f82397f07aa161fdf9
commit d975bf0ecbf8e10f745585f82397f07aa161fdf9
Merge: b133045 e9985b3
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue May 31 16:30:32 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 31 16:30:32 2016 -0400
Merge topic 'cpack-documentation-improvements' into next
e9985b3c fixup! CPackRPM and CPackDeb documentation improvements
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9985b3c34609f1385123768f9bb44ce314d51b8
commit e9985b3c34609f1385123768f9bb44ce314d51b8
Author: Domen Vrankar <domen.vran...@gmail.com>
AuthorDate: Tue May 31 22:30:16 2016 +0200
Commit: Domen Vrankar <domen.vran...@gmail.com>
CommitDate: Tue May 31 22:30:16 2016 +0200
fixup! CPackRPM and CPackDeb documentation improvements
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 866e275..30b65c2 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -25,8 +25,9 @@
#
# Here are some CPackDeb wiki resources that are here for historic reasons and
# are no longer maintained but may still prove useful:
-# https://cmake.org/Wiki/CMake:CPackConfiguration
-# https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29
+#
+# - https://cmake.org/Wiki/CMake:CPackConfiguration
+# - https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29
#
# List of CPackRPM specific variables:
#
@@ -380,7 +381,7 @@
# * Default : OFF
#
# Allows to generate shlibs control file automatically. Compatibility is
defined by
-# CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY variable value.
+# :variable:`CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY` variable value.
#
# .. note::
#
@@ -390,6 +391,8 @@
#
# .. variable:: CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY
#
+# Compatibility policy for auto-generated shlibs control file.
+#
# * Mandatory : NO
# * Default : "="
#
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 4e68555..8c51b45 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -36,8 +36,9 @@
#
# Here are some CPackRPM wiki resources that are here for historic reasons and
# are no longer maintained but may still prove useful:
-# https://cmake.org/Wiki/CMake:CPackConfiguration
-# https://cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29
+#
+# - https://cmake.org/Wiki/CMake:CPackConfiguration
+# - https://cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29
#
# List of CPackRPM specific variables:
#
@@ -375,6 +376,8 @@
#
# .. variable:: CPACK_RPM_SPEC_INSTALL_POST
#
+# Deprecated - use :variable:`CPACK_RPM_POST_INSTALL_SCRIPT_FILE` instead.
+#
# * Mandatory : NO
# * Default : -
# * Deprecated: YES
@@ -438,6 +441,8 @@
# .. variable:: CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
# CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
#
+# Path to file containing pre (un)install script.
+#
# * Mandatory : NO
# * Default : -
#
@@ -455,6 +460,8 @@
# .. variable:: CPACK_RPM_POST_INSTALL_SCRIPT_FILE
# CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
#
+# Path to file containing post (un)install script.
+#
# * Mandatory : NO
# * Default : -
#
@@ -520,6 +527,8 @@
#
# .. variable:: CPACK_RPM_RELOCATION_PATHS
#
+# Packages relocation paths list.
+#
# * Mandatory : NO
# * Default : -
#
@@ -541,15 +550,19 @@
#
# .. variable:: CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX
#
+# Per component relocation path install prefix.
+#
# * Mandatory : NO
# * Default : CPACK_PACKAGING_INSTALL_PREFIX
#
-# May be used to set per component CPACK_PACKAGING_INSTALL_PREFIX for
-# relocatable RPM packages.
+# May be used to set per component :variable:`CPACK_PACKAGING_INSTALL_PREFIX`
+# for relocatable RPM packages.
#
# .. variable:: CPACK_RPM_NO_INSTALL_PREFIX_RELOCATION
# CPACK_RPM_NO_<COMPONENT>_INSTALL_PREFIX_RELOCATION
#
+# Removal of default install prefix from relocation paths list.
+#
# * Mandatory : NO
# * Default : CPACK_PACKAGING_INSTALL_PREFIX or
CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX
# are treated as one of relocation paths
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackDeb.cmake | 9 ++++++---
Modules/CPackRPM.cmake | 21 +++++++++++++++++----
2 files changed, 23 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
