[Cmake-commits] CMake branch, next, updated. v3.2.1-1136-gd8ddc03

[Domen Vrankar]

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  d8ddc031d5404f53afbcdb871a229d3956e99d89 (commit)
       via  18917d66d4997786afcb27580518e325342117d2 (commit)
      from  ac6036ba4216f1059b2e9531676de6a99e79227e (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=d8ddc031d5404f53afbcdb871a229d3956e99d89
commit d8ddc031d5404f53afbcdb871a229d3956e99d89
Merge: ac6036b 18917d6
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Mar 20 16:57:39 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 20 16:57:39 2015 -0400

    Merge topic 'cpack-rpm-ignore-default-prefix' into next
    
    18917d66 CPack/RPM ignore install prefix relocation path


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18917d66d4997786afcb27580518e325342117d2
commit 18917d66d4997786afcb27580518e325342117d2
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Mar 20 21:52:49 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Mar 20 21:52:49 2015 +0100

    CPack/RPM ignore install prefix relocation path
    
    Patch adds possibility to remove
    CPACK_PACKAGING_INSTALL_PREFIX from
    the list of relocation paths when
    crating a relocatable rpm.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 539a0aa..162eba7 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -408,6 +408,16 @@
 #
 #  May be used to set per component CPACK_PACKAGING_INSTALL_PREFIX for
 #  relocatable RPM packages.
+#
+# .. variable:: CPACK_RPM_NO_INSTALL_PREFIX_RELOCATION
+#               CPACK_RPM_NO_<COMPONENT>_INSTALL_PREFIX_RELOCATION
+#
+#  * Mandatory : NO
+#  * Default   : CPACK_PACKAGING_INSTALL_PREFIX or CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX
+#                are treated as one of relocation paths
+#
+#  May be used to remove CPACK_PACKAGING_INSTALL_PREFIX and CPACK_RPM_<COMPONENT>_PACKAGE_PREFIX
+#  from relocatable RPM prefix paths.
 
 #=============================================================================
 # Copyright 2007-2009 Kitware, Inc.
@@ -437,8 +447,15 @@ function(cpack_rpm_prepare_relocation_paths)
 
   # set base path prefix
   if(EXISTS "${WDIR}/${PATH_PREFIX}")
-    set(TMP_RPM_PREFIXES "${TMP_RPM_PREFIXES}Prefix: ${PATH_PREFIX}\n")
-    list(APPEND RPM_USED_PACKAGE_PREFIXES "${PATH_PREFIX}")
+    if(NOT CPACK_RPM_NO_INSTALL_PREFIX_RELOCATION AND
+       NOT CPACK_RPM_NO_${CPACK_RPM_PACKAGE_COMPONENT}_INSTALL_PREFIX_RELOCATION)
+      set(TMP_RPM_PREFIXES "${TMP_RPM_PREFIXES}Prefix: ${PATH_PREFIX}\n")
+      list(APPEND RPM_USED_PACKAGE_PREFIXES "${PATH_PREFIX}")
+
+      if(CPACK_RPM_PACKAGE_DEBUG)
+        message("CPackRPM:Debug: removing '${PATH_PREFIX}' from relocation paths")
+      endif()
+    endif()
   endif()
 
   # set other path prefixes
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
index 109bb1c..ac9b552 100644
--- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
+++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
@@ -28,6 +28,10 @@ if(CPACK_GENERATOR MATCHES "RPM")
 
   # test package description override - headers rpm is generated in the middle
   set(CPACK_RPM_headers_PACKAGE_DESCRIPTION "headers description")
+
+  # test package do not use CPACK_PACKAGING_INSTALL_PREFIX
+  # as relocation path
+  set(CPACK_RPM_NO_libraries_INSTALL_PREFIX_RELOCATION true)
 endif()
 
 if(CPACK_GENERATOR MATCHES "DEB")
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 6762b45..cf4da74 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -174,10 +174,10 @@ if(CPackGen MATCHES "RPM")
       if(check_file_libraries_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_LIBRARIES_DESCRIPTION}.*")
-        set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+        set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
         set(check_file_match_expected_architecture "") # we don't explicitly set this value so it is different on each platform - ignore it
         set(spec_regex "*libraries*")
-        set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/lib.*\n/usr/foo/bar/lib.*/libmylib.a$")
+        set(check_content_list "^/usr/foo/bar/lib.*\n/usr/foo/bar/lib.*/libmylib.a$")
       elseif(check_file_headers_match)
         set(check_file_match_expected_summary ".*${CPACK_RPM_headers_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_RPM_headers_PACKAGE_DESCRIPTION}.*")

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

Summary of changes:
 Modules/CPackRPM.cmake                             |   21 ++++++++++++++++++--
 .../MyLibCPackConfig-IgnoreGroup.cmake.in          |    4 ++++
 .../RunCPackVerifyResult.cmake                     |    4 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake