[Cmake-commits] CMake branch, next, updated. v3.1.2-1215-g7b5cca3

[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  7b5cca3b2f6a29d570a0ad74ffe242661a930a92 (commit)
       via  68e2abd3912d2ac859c161e9b843d878a7aa76ef (commit)
      from  4367669ad48ddd7dafabeb8b89e1a4c01189d376 (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=7b5cca3b2f6a29d570a0ad74ffe242661a930a92
commit 7b5cca3b2f6a29d570a0ad74ffe242661a930a92
Merge: 4367669 68e2abd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:32:22 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:32:22 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    68e2abd3 CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68e2abd3912d2ac859c161e9b843d878a7aa76ef
commit 68e2abd3912d2ac859c161e9b843d878a7aa76ef
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Tue Feb 10 23:03:06 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 09:31:09 2015 -0500

    CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW
    
    The file(GLOB_RECURSE) call added by commit 3ec02547 (CPackRPM: Allow
    multiple path relocation prefixes for one package, 2015-01-21) should
    not follow directory symlinks, so make sure CMP0009 is set to NEW.

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:


hooks/post-receive
-- 
CMake