summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-12 16:52:58 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-02-12 16:52:58 (GMT)
commita4a6b55f08e37ce9b8a17680cc30ece66d048ec7 (patch)
treeac8218937a17aaa5000daa0f24a9014128315498 /Modules
parent09cdcc54303bf065022a997056f403dd0707bc7e (diff)
parentbe36bfd65d53962c7ba975382bd911e0857f6a33 (diff)
downloadCMake-a4a6b55f08e37ce9b8a17680cc30ece66d048ec7.zip
CMake-a4a6b55f08e37ce9b8a17680cc30ece66d048ec7.tar.gz
CMake-a4a6b55f08e37ce9b8a17680cc30ece66d048ec7.tar.bz2
Merge topic 'cpack_rpm_mulit_prefix_fixup'
be36bfd6 CPackRPM: Do not run file(GLOB_RECURSE) without CMP0009 set to NEW
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)