[Cmake-commits] CMake branch, next, updated. v3.1.2-1217-ge54b99a

[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  e54b99aa321c4290e0dce1c547107642005e78b4 (commit)
       via  02fc84777922c6de9923e3f5ef0ac4d3bd7b1bc4 (commit)
      from  7b5cca3b2f6a29d570a0ad74ffe242661a930a92 (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=e54b99aa321c4290e0dce1c547107642005e78b4
commit e54b99aa321c4290e0dce1c547107642005e78b4
Merge: 7b5cca3 02fc847
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:56:21 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:56:21 2015 -0500

    Merge topic 'cpack_rpm_mulit_prefix_fixup' into next
    
    02fc8477 fixup! CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02fc84777922c6de9923e3f5ef0ac4d3bd7b1bc4
commit 02fc84777922c6de9923e3f5ef0ac4d3bd7b1bc4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:33:51 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 11 09:33:51 2015 -0500

    fixup! CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index c53caa1..7516393 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -423,10 +423,6 @@
 
 # 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)
@@ -459,7 +455,12 @@ function(cpack_rpm_prepare_relocation_paths)
   endforeach()
 
   # warn about all the paths that are not relocatable
-  file(GLOB_RECURSE FILE_PATHS_ "${WDIR}/*")
+  cmake_policy(PUSH)
+    # Tell file(GLOB_RECURSE) not to follow directory symlinks
+    # even if the project does not set this policy to NEW.
+    cmake_policy(SET CMP0009 NEW)
+    file(GLOB_RECURSE FILE_PATHS_ "${WDIR}/*")
+  cmake_policy(POP)
   foreach(TMP_PATH ${FILE_PATHS_})
     string(LENGTH "${WDIR}" WDIR_LEN)
     string(SUBSTRING "${TMP_PATH}" ${WDIR_LEN} -1 TMP_PATH)
@@ -1312,6 +1313,3 @@ if(CPACK_RPM_PACKAGE_DESCRIPTION_)
 else()
   unset(CPACK_RPM_PACKAGE_DESCRIPTION)
 endif()
-
-# restore previous policies
-cmake_policy(POP)

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

Summary of changes:
 Modules/CPackRPM.cmake |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake