build: update to some more modern behaviours

Use more modern property setting for the RPATH rather than spreading the
workaround throughout the build.  Centralise the Swift module directory
handling.

Author: compnerd

CMakeLists.txt

@@ -18,6 +18,10 @@ enable_testing()
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" CACHE
   STRING "MSVC Runtime Library")
 
+set(CMAKE_LIBRARY_OUTPUT_DIR ${CMAKE_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIR ${CMAKE_BINARY_DIR})
+set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
+
 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 ")

Sources/Foundation/CMakeLists.txt

@@ -148,20 +148,14 @@ target_link_libraries(Foundation
     swiftDispatch)
 set_target_properties(Foundation PROPERTIES
   INSTALL_RPATH "$ORIGIN"
-  Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
+  BUILD_RPATH "$<TARGET_FILE_DIR:swiftDispatch>"
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
 
 if(CMAKE_SYSTEM_NAME STREQUAL Windows AND CMAKE_VERSION VERSION_LESS 3.16)
   # Workaround for CMake 3.15 which doesn't link in the resource file target
   # properly
   add_dependencies(Foundation CoreFoundationResources)
   target_link_options(Foundation PRIVATE $<TARGET_OBJECTS:CoreFoundationResources>)
-
-  # Workaround for CMake 3.15 which doesn't handle `-rpath` properly
-  if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
-    target_link_options(Foundation PRIVATE
-      "SHELL:-Xlinker -rpath -Xlinker $<TARGET_FILE_DIR:swiftDispatch>")
-  endif()
 endif()
 
 
@@ -172,6 +166,6 @@ install(TARGETS Foundation
   RUNTIME DESTINATION bin)
 get_swift_host_arch(swift_arch)
 install(FILES
-  ${CMAKE_BINARY_DIR}/swift/Foundation.swiftdoc
-  ${CMAKE_BINARY_DIR}/swift/Foundation.swiftmodule
+  $<TARGET_PROPERTY:Foundation,Swift_MODULE_DIRECTORY>/Foundation.swiftdoc
+  $<TARGET_PROPERTY:Foundation,Swift_MODULE_DIRECTORY>/Foundation.swiftmodule
   DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch})

Sources/FoundationNetworking/CMakeLists.txt

@@ -39,7 +39,6 @@ target_link_libraries(FoundationNetworking PRIVATE
   CFURLSessionInterface)
 set_target_properties(FoundationNetworking PROPERTIES
   INSTALL_RPATH "$ORIGIN"
-  Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
 
 
@@ -50,6 +49,6 @@ install(TARGETS FoundationNetworking
   RUNTIME DESTINATION bin)
 get_swift_host_arch(swift_arch)
 install(FILES
-  ${CMAKE_BINARY_DIR}/swift/FoundationNetworking.swiftdoc
-  ${CMAKE_BINARY_DIR}/swift/FoundationNetworking.swiftmodule
+  $<TARGET_PROPERTY:FoundationNetworking,Swift_MODULE_DIRECTORY>/FoundationNetworking.swiftdoc
+  $<TARGET_PROPERTY:FoundationNetworking,Swift_MODULE_DIRECTORY>/FoundationNetworking.swiftmodule
   DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch})

Sources/FoundationXML/CMakeLists.txt

@@ -15,7 +15,6 @@ target_link_libraries(FoundationXML PRIVATE
   CFXMLInterface)
 set_target_properties(FoundationXML PROPERTIES
   INSTALL_RPATH "$ORIGIN"
-  Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
 
 
@@ -26,6 +25,6 @@ install(TARGETS FoundationXML
   RUNTIME DESTINATION bin)
 get_swift_host_arch(swift_arch)
 install(FILES
-  ${CMAKE_BINARY_DIR}/swift/FoundationXML.swiftdoc
-  ${CMAKE_BINARY_DIR}/swift/FoundationXML.swiftmodule
+  $<TARGET_PROPERTY:FoundationXML,Swift_MODULE_DIRECTORY>/FoundationXML.swiftdoc
+  $<TARGET_PROPERTY:FoundationXML,Swift_MODULE_DIRECTORY>/FoundationXML.swiftmodule
   DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch})

Tests/Tools/XDGTestHelper/CMakeLists.txt

@@ -4,11 +4,5 @@ target_link_libraries(xdgTestHelper PRIVATE
   Foundation
   FoundationNetworking
   FoundationXML)
-
-if(CMAKE_VERSION VERSION_LESS 3.16)
-  if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
-    target_link_options(xdgTestHelper PRIVATE
-      "SHELL:-Xlinker -rpath -Xlinker $<TARGET_FILE_DIR:swiftDispatch>"
-      "SHELL:-Xlinker -rpath -Xlinker $<TARGET_FILE_DIR:Foundation>")
-  endif()
-endif()
+set_target_properties(xdgTestHelper PROPERTIES
+  BUILD_RPATH "$<TARGET_FILE_DIR:swiftDispatch>;$<TARGET_FILE_DIR:Foundation>")