[Cmake-commits] CMake branch, next, updated. v3.2.1-1320-g9aa6d85

[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  9aa6d8588b8ec2b0ebe9792ab732c428cca8e032 (commit)
       via  1e29843bedbeddb204314b6dc951687c59d6ea6b (commit)
      from  85de1ddd36462a7ef0fbcc6ea3ecd7d62a515491 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9aa6d8588b8ec2b0ebe9792ab732c428cca8e032
commit 9aa6d8588b8ec2b0ebe9792ab732c428cca8e032
Merge: 85de1dd 1e29843
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 14:03:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 31 14:03:54 2015 -0400

    Merge topic 'cpack-rpm-basic-symlink-handling' into next
    
    1e29843b fixup! CPack/RPM basic symlink support


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e29843bedbeddb204314b6dc951687c59d6ea6b
commit 1e29843bedbeddb204314b6dc951687c59d6ea6b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 14:03:03 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 14:03:05 2015 -0400

    fixup! CPack/RPM basic symlink support
    
    Move documentation to end since it is not the primary functionality
    of the generator.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index f4c853b..b8d518c 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -4,43 +4,6 @@
 #
 # The builtin (binary) CPack RPM generator (Unix only)
 #
-# Packaging of symbolic links
-# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-#
-# CPackRPM supports packaging of symbolic links.
-#
-# ::
-#
-#   execute_process(COMMAND ${CMAKE_COMMAND}
-#     -E create_symlink <relative_path_location> <symlink_name>)
-#   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/<symlink_name>
-#     DESTINATION <symlink_location> COMPONENT libraries)
-#
-# Symbolic links will be optimized (paths will be shortened if possible)
-# before being added to the package or if multiple relocation paths are
-# detected, a post install symlink relocation script will be generated.
-#
-# Symbolic links may point to locations that are not packaged by the same
-# package (either a different component or even not packaged at all) but
-# those locations will be treated as if they were a part of the package
-# while determining if symlink should be either created or present in a
-# post install script - depending on relocation paths.
-#
-# Currenty there are a few limitations though:
-#
-# * Only symbolic links with relative path can be packaged.
-#
-# * For component based packaging component interdependency is not checked
-#   when processing symbolic links. Symbolic links pointing to content of
-#   a different component are treated the same way as if pointing to location
-#   that will not be packaged.
-#
-# * Symbolic links pointing to a location through one or more intermediate
-#   symbolic links will not be handled differently - if the intermediate
-#   symbolic link(s) is also on a relocatable path, relocating it during
-#   package installation may cause initial symbolic link to point to an
-#   invalid location.
-#
 # Variables specific to CPack RPM generator
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 #
@@ -455,6 +418,41 @@
 #
 #  May be used to remove CPACK_PACKAGING_INSTALL_PREFIX and CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX
 #  from relocatable RPM prefix paths.
+#
+# Packaging of Symbolic Links
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+#
+# CPackRPM supports packaging of symbolic links::
+#
+#   execute_process(COMMAND ${CMAKE_COMMAND}
+#     -E create_symlink <relative_path_location> <symlink_name>)
+#   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/<symlink_name>
+#     DESTINATION <symlink_location> COMPONENT libraries)
+#
+# Symbolic links will be optimized (paths will be shortened if possible)
+# before being added to the package or if multiple relocation paths are
+# detected, a post install symlink relocation script will be generated.
+#
+# Symbolic links may point to locations that are not packaged by the same
+# package (either a different component or even not packaged at all) but
+# those locations will be treated as if they were a part of the package
+# while determining if symlink should be either created or present in a
+# post install script - depending on relocation paths.
+#
+# Currenty there are a few limitations though:
+#
+# * Only symbolic links with relative path can be packaged.
+#
+# * For component based packaging component interdependency is not checked
+#   when processing symbolic links. Symbolic links pointing to content of
+#   a different component are treated the same way as if pointing to location
+#   that will not be packaged.
+#
+# * Symbolic links pointing to a location through one or more intermediate
+#   symbolic links will not be handled differently - if the intermediate
+#   symbolic link(s) is also on a relocatable path, relocating it during
+#   package installation may cause initial symbolic link to point to an
+#   invalid location.
 
 #=============================================================================
 # Copyright 2007-2009 Kitware, Inc.

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

Summary of changes:
 Modules/CPackRPM.cmake |   72 +++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 37 deletions(-)


hooks/post-receive
-- 
CMake