diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-13 14:37:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-13 14:37:42 (GMT) |
| commit | a1216139f800a403fa04478a79162d2ca0c6a2f8 (patch) | |
| tree | b331052a37bafb751cb53403a5d47eb0174fde5f | |
| parent | 28bc41ca62b00d5c265c83436f317f970a4b9a93 (diff) | |
| parent | a27a1c7e881f9381c38a7f17fa29fc537a274c9a (diff) | |
| download | CMake-a1216139f800a403fa04478a79162d2ca0c6a2f8.zip CMake-a1216139f800a403fa04478a79162d2ca0c6a2f8.tar.gz CMake-a1216139f800a403fa04478a79162d2ca0c6a2f8.tar.bz2 | |
Merge topic 'swift-rpath-separator' into release-3.16
a27a1c7e88 Swift: Allow build and installed RPATHs to differ
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4037
| -rw-r--r-- | Modules/CMakeSwiftInformation.cmake | 1 |
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 ") |