[Cmake-commits] CMake branch, next, updated. v3.1.2-1183-gfd2cc9a

[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  fd2cc9a1071279c0e3d41c38d670d0e669ab92bb (commit)
       via  a06feb122e5a76f43f2cdbfe6ef5ed54ad711375 (commit)
      from  5e36f8ee1ebf4538146f9f0cb5974426eac14249 (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=fd2cc9a1071279c0e3d41c38d670d0e669ab92bb
commit fd2cc9a1071279c0e3d41c38d670d0e669ab92bb
Merge: 5e36f8e a06feb1
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Feb 10 17:04:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 17:04:53 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_policy_version_fixup' into next
    
    a06feb12 fixup! cpack_rpm_mulit_prefix


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a06feb122e5a76f43f2cdbfe6ef5ed54ad711375
commit a06feb122e5a76f43f2cdbfe6ef5ed54ad711375
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Feb 10 23:03:06 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Tue Feb 10 23:03:06 2015 +0100

    fixup! cpack_rpm_mulit_prefix
    
    Fix infinite loop with symbolic links when using minimum
    required cmake version with CMP0009 policy not set in
    logic added by commit 3ec02547 (CPackRPM: Allow multiple
    path relocation prefixes for one package, 2015-01-21).

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 214d655..c53caa1 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -423,6 +423,10 @@
 
 # Author: Eric Noulard with the help of Alexander Neundorf.
 
+# prevent older policies from interfearing with this script
+cmake_policy(PUSH)
+cmake_policy(VERSION ${CMAKE_VERSION})
+
 function(cpack_rpm_prepare_relocation_paths)
   # set appropriate prefix, remove possible trailing slash and convert backslashes to slashes
   if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_PREFIX)
@@ -1308,3 +1312,6 @@ if(CPACK_RPM_PACKAGE_DESCRIPTION_)
 else()
   unset(CPACK_RPM_PACKAGE_DESCRIPTION)
 endif()
+
+# restore previous policies
+cmake_policy(POP)

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

Summary of changes:
 Modules/CPackRPM.cmake |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake