[Cmake-commits] CMake branch, next, updated. v3.6.2-2289-gc569163

[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  c569163f4fab72d1e8f7c1f066fe864dcc9335fe (commit)
       via  1bb31cc2f89de873ddf84bec65c02266625e84fa (commit)
      from  056a10260dbf914602c7162c8c6d7b5addace1bb (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=c569163f4fab72d1e8f7c1f066fe864dcc9335fe
commit c569163f4fab72d1e8f7c1f066fe864dcc9335fe
Merge: 056a102 1bb31cc
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Mon Sep 19 18:18:29 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 19 18:18:29 2016 -0400

    Merge topic 'cpack-rpm-policy-warnings' into next
    
    1bb31cc2 cpack-rpm-policy-warnings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bb31cc2f89de873ddf84bec65c02266625e84fa
commit 1bb31cc2f89de873ddf84bec65c02266625e84fa
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Sep 20 00:17:54 2016 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Sep 20 00:17:54 2016 +0200

    cpack-rpm-policy-warnings
    
    For older versions of CMake minimum
    required version CMP0007 policy
    warning was printed out.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 36caac6..90b3943 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -847,7 +847,10 @@ function(cpack_rpm_prepare_content_list)
         set(_DISTINCT_PATH "${_RPM_RELOCATION_PREFIX}")
 
         string(REPLACE "/" ";" _CPACK_RPM_PACKAGE_PREFIX_ELEMS " ${_RPM_RELOCATION_PREFIX}")
-        list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
+        cmake_policy(PUSH)
+          cmake_policy(SET CMP0007 NEW)
+          list(REMOVE_AT _CPACK_RPM_PACKAGE_PREFIX_ELEMS -1)
+        cmake_policy(POP)
         unset(_TMP_LIST)
         # Now generate all of the parent dirs of the relocation path
         foreach(_PREFIX_PATH_ELEM ${_CPACK_RPM_PACKAGE_PREFIX_ELEMS})

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

Summary of changes:
 Modules/CPackRPM.cmake |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake