summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2019-11-11 22:25:08 (GMT)
committerBrad King <brad.king@kitware.com>2019-11-12 15:02:06 (GMT)
commita27a1c7e881f9381c38a7f17fa29fc537a274c9a (patch)
treeee20ce9a8a8807c15788ce21fac8a19d672310fa
parentc1d5d5eb11e0260ffadda0851ac844ab46b6b179 (diff)
downloadCMake-a27a1c7e881f9381c38a7f17fa29fc537a274c9a.zip
CMake-a27a1c7e881f9381c38a7f17fa29fc537a274c9a.tar.gz
CMake-a27a1c7e881f9381c38a7f17fa29fc537a274c9a.tar.bz2
Swift: Allow build and installed RPATHs to differ
Define the RPATH separator to `:` so that CMake can reserve room to edit the ELF RPATH at install time. This enables the use of `BUILD_RPATH` and `INSTALL_RPATH` with differing values.
-rw-r--r--Modules/CMakeSwiftInformation.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/CMakeSwiftInformation.cmake b/Modules/CMakeSwiftInformation.cmake
index 1f0e8f3..f2bf232 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -26,6 +26,7 @@ endif()
if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ")
+ set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP ":")
endif()
set(CMAKE_Swift_COMPILE_OPTIONS_TARGET "-target ")