Merge pull request #2559 from compnerd/rpath

build: honour and use RPATHs

Author: compnerd

CMakeLists.txt

@@ -17,6 +17,12 @@ enable_testing()
 # Cache the variable to allow the user to alter the configuration.
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" CACHE
   STRING "MSVC Runtime Library")
+if(CMAKE_VERSION VERSION_LESS 3.16.0)
+  if(NOT (CMAKE_SYSTEM_NAME STREQUAL Windows OR CMAKE_SYSTEM_NAME STREQUAL Darwin))
+    set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG "-Xlinker -rpath -Xlinker ")
+    set(CMAKE_SHARED_LIBRARY_RUNTIME_Swift_FLAG_SEP ":")
+  endif()
+endif()
 
 option(BUILD_SHARED_LIBS "build shared libraries" ON)
 

Foundation/CMakeLists.txt

@@ -153,6 +153,7 @@ target_link_libraries(Foundation PRIVATE
   uuid)
 target_link_libraries(Foundation PUBLIC
   swiftDispatch)
+
 # TODO(compnerd) properly propogate `BUILD_RPATH` to the target using CMake
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   target_link_options(Foundation PRIVATE
@@ -167,6 +168,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
     pathcch)
 endif()
 set_target_properties(Foundation PROPERTIES
+  INSTALL_RPATH "$ORIGIN"
   Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
 
@@ -216,6 +218,7 @@ target_link_libraries(FoundationNetworking PRIVATE
   Foundation
   CFURLSessionInterface)
 set_target_properties(FoundationNetworking PROPERTIES
+  INSTALL_RPATH "$ORIGIN"
   Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
 
@@ -240,9 +243,11 @@ target_link_libraries(FoundationXML PRIVATE
   Foundation
   CFXMLInterface)
 set_target_properties(FoundationXML PROPERTIES
+  INSTALL_RPATH "$ORIGIN"
   Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
 
+
 set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS
   Foundation FoundationNetworking FoundationXML)
 get_swift_host_arch(swift_arch)

Tools/plutil/CMakeLists.txt

@@ -3,11 +3,8 @@ add_executable(plutil
   main.swift)
 target_link_libraries(plutil PRIVATE
   Foundation)
-# TODO(compnerd) properly propogate `BUILD_RPATH` to the target using CMake
-if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
-  target_link_options(plutil PRIVATE
-    "SHELL:-Xlinker -rpath -Xlinker $$$$ORIGIN/../lib/swift/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>:$<TARGET_FILE_DIR:Foundation>")
-endif()
+set_target_properties(plutil PROPERTIES
+  INSTALL_RPATH "$ORIGIN/../lib/swift/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>")
 
 set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS plutil)
 install(TARGETS plutil