diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-12 12:17:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-12 12:18:04 (GMT) |
| commit | fffbafc607a835c0e33804d7182e67b4a2cdc523 (patch) | |
| tree | 56b00fcd872a0ad65b6c4967d6b3369722dd4195 /Modules | |
| parent | 9fd5ca4e66fe6c915e33837f7454b246b09deb2a (diff) | |
| parent | f481b3a947eaaae853c3e1675ba824246204c284 (diff) | |
| download | CMake-fffbafc607a835c0e33804d7182e67b4a2cdc523.zip CMake-fffbafc607a835c0e33804d7182e67b4a2cdc523.tar.gz CMake-fffbafc607a835c0e33804d7182e67b4a2cdc523.tar.bz2 | |
Merge topic 'swift-rpath'
f481b3a947 Swift: repair RPATH handling for macOS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4456
Diffstat (limited to 'Modules')
| -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 ba242ec..8f0909c 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() |