summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-11 16:08:37 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-11 16:08:37 (GMT)
commitda92cdab5206d0556822ee12350636300ec73160 (patch)
tree537c14118a9ad3aa2352ed95a714115c665281f6 /Modules
parenta4568ca597ac94a32ea4e0e318e8175e614bc5ab (diff)
parentbe36bfd65d53962c7ba975382bd911e0857f6a33 (diff)
downloadCMake-da92cdab5206d0556822ee12350636300ec73160.zip
CMake-da92cdab5206d0556822ee12350636300ec73160.tar.gz
CMake-da92cdab5206d0556822ee12350636300ec73160.tar.bz2
Merge branch 'cpack_rpm_mulit_prefix_fixup' into releasev3.2.0-rc1
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CPackRPM.cmake7
1 files changed, 6 insertions, 1 deletions
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)