summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Strzelecki <ono@java.pl>2014-09-04 10:28:41 (GMT)
committerBrad King <brad.king@kitware.com>2014-10-10 14:16:15 (GMT)
commit14bc686fffd1ecf3073d2d394af96bdb6e5b8769 (patch)
tree24999931b173be156462324e98a60acf68cf5a68
parent6c313797418a90f4e108a04e9b9e70b1c32e74ff (diff)
downloadCMake-14bc686fffd1ecf3073d2d394af96bdb6e5b8769.zip
CMake-14bc686fffd1ecf3073d2d394af96bdb6e5b8769.tar.gz
CMake-14bc686fffd1ecf3073d2d394af96bdb6e5b8769.tar.bz2
GetPrerequisites: Make sure dyld placeholders are prefixes
Mac OS X dyld placeholders should be always prefixes, otherwise this can lead to some undefined behavior.
-rw-r--r--Modules/GetPrerequisites.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 05c2edb..49443e3 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -329,7 +329,7 @@ function(gp_resolve_item context item exepath dirs resolved_item_var)
endif()
if(NOT resolved)
- if(item MATCHES "@executable_path")
+ if(item MATCHES "^@executable_path")
#
# @executable_path references are assumed relative to exepath
#
@@ -347,7 +347,7 @@ function(gp_resolve_item context item exepath dirs resolved_item_var)
endif()
if(NOT resolved)
- if(item MATCHES "@loader_path")
+ if(item MATCHES "^@loader_path")
#
# @loader_path references are assumed relative to the
# PATH of the given "context" (presumably another library)
@@ -367,7 +367,7 @@ function(gp_resolve_item context item exepath dirs resolved_item_var)
endif()
if(NOT resolved)
- if(item MATCHES "@rpath")
+ if(item MATCHES "^@rpath")
#
# @rpath references are relative to the paths built into the binaries with -rpath
# We handle this case like we do for other Unixes