[Cmake-commits] CMake branch, next, updated. v3.1.2-1219-g0e9460a

[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  0e9460a458bb4b5e02594a0a2f4579845f77d37b (commit)
       via  be36bfd65d53962c7ba975382bd911e0857f6a33 (commit)
      from  e54b99aa321c4290e0dce1c547107642005e78b4 (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=0e9460a458bb4b5e02594a0a2f4579845f77d37b
commit 0e9460a458bb4b5e02594a0a2f4579845f77d37b
Merge: e54b99a be36bfd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 11 09:56:47 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 11 09:56:47 2015 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be36bfd65d53962c7ba975382bd911e0857f6a33
commit be36bfd65d53962c7ba975382bd911e0857f6a33
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:56:27 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..7516393 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -455,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)

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

Summary of changes:


hooks/post-receive
-- 
CMake