diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-12 12:17:56 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-12 08:18:03 -0400 |
| commit | c5f850d1455cad84a786ff249c9602804ef59041 (patch) | |
| tree | 64651066e672cc53e6e4b02ad7af54524b38954c | |
| parent | 3d388e5e986b7053d25cd319400e1e21410cf9c3 (diff) | |
| parent | f481b3a947eaaae853c3e1675ba824246204c284 (diff) | |
| download | cmake-c5f850d1455cad84a786ff249c9602804ef59041.tar.gz | |
Merge topic 'swift-rpath' into release-3.17
f481b3a947 Swift: repair RPATH handling for macOS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4456
| -rw-r--r-- | Modules/CMakeSwiftInformation.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Modules/CMakeSwiftInformation.cmake b/Modules/CMakeSwiftInformation.cmake index ba242ec278..8f0909c997 100644 --- a/Modules/CMakeSwiftInformation.cmake +++ b/Modules/CMakeSwiftInformation.cmake @@ -27,12 +27,14 @@ elseif(NOT CMAKE_SYSTEM_NAME STREQUAL Windows) endif() if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows) + set(CMAKE_EXECUTABLE_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ") set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ") - set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP ":") - - if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(CMAKE_EXECUTABLE_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ") + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(CMAKE_EXECUTABLE_RUNTIME_Swift_FLAG_SEP "") + set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP "") + else() set(CMAKE_EXECUTABLE_RUNTIME_Swift_FLAG_SEP ":") + set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP ":") endif() endif() |