WIP Windows

Author: rintaro

CMakeLists.txt

@@ -15,6 +15,8 @@ endif()
 project(SwiftTesting
   LANGUAGES CXX Swift)
 
+include(GNUInstallDirs)
+
 list(APPEND CMAKE_MODULE_PATH
   ${PROJECT_SOURCE_DIR}/cmake/modules
   ${PROJECT_SOURCE_DIR}/cmake/modules/shared)

Sources/CMakeLists.txt

@@ -8,12 +8,18 @@
 
 # Macros must be built for the build machine, not the host.
 include(ExternalProject)
+
 if(NOT SwiftTesting_MACRO_MAKE_PROGRAM)
   set(SwiftTesting_MACRO_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
 endif()
 if(NOT SwiftTesting_MACRO_Swift_COMPILER)
   set(SwiftTesting_MACRO_Swift_COMPILER ${CMAKE_Swift_COMPILER})
 endif()
+if(NOT SwiftTesting_MACRO_Swift_FLAGS)
+  set(SwiftTesting_MACRO_Swift_FLAGS ${CMAKE_Swift_FLAGS})
+  set(SwiftTesting_MACRO_SWIFT_FLAGS_RELEAE ${CMAKE_Swift_FLAGS_RELEAE})
+  set(SwiftTesting_MACRO_SWIFT_FLAGS_RELWITHDEBINFO ${CMAKE_Swift_FLAGS_RELWITHDEBINFO})
+endif()
 if(NOT SwiftTesting_MACRO_AR)
   set(SwiftTesting_MACRO_AR ${CMAKE_AR})
 endif()
@@ -32,10 +38,11 @@ ExternalProject_Add(TestingMacros
   PREFIX "tm"
   SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/TestingMacros"
   CMAKE_ARGS
+    -DCMAKE_MAKE_PROGRAM=${SwiftTesting_MACRO_MAKE_PROGRAM}
     -DCMAKE_Swift_COMPILER=${SwiftTesting_MACRO_Swift_COMPILER}
+    -DCMAKE_Swift_FLAGS=${SwiftTesting_MACRO_Swift_FLAGS}
     -DCMAKE_AR=${SwiftTesting_MACRO_AR}
     -DCMAKE_RANLIB=${SwiftTesting_MACRO_RANLIB}
-    -DCMAKE_MAKE_PROGRAM=${SwiftTesting_MACRO_MAKE_PROGRAM}
     -DSwiftTesting_BuildMacrosAsExecutables=${SwiftTesting_BuildMacrosAsExecutables}
     -DSwiftSyntax_DIR=${SwiftSyntax_DIR}
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>)
@@ -52,14 +59,15 @@ if(NOT SwiftTesting_BuildMacrosAsExecutables)
   # TestingMacros uses `ExternalProject` and we cannot directly query the
   # properties of its targets here.
   if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-    set(SwiftTesting_TestingMacrosLibraryName "libTestingMacros.dylib")
+    install(PROGRAMS "${INSTALL_DIR}/lib/swift/host/plugins/testing/libTestingMacros.dylib"
+      DESTINATION lib/swift/host/plugins/testing)
   elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-    set(SwiftTesting_TestingMacrosLibraryName "libTestingMacros.so")
+    install(PROGRAMS "${INSTALL_DIR}/lib/swift/host/plugins/libTestingMacros.so"
+      DESTINATION lib/swift/host/plugins)
+  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+    # In Windows toolchain, TestingMacros.dll is installed from seprate CMake 
+    # buikd, just for the macros.
   else()
     message(FATAL_ERROR "Unable to determine the library name for TestingMacros based on system name: ${CMAKE_SYSTEM_NAME}")
   endif()
-
-  install(PROGRAMS "${INSTALL_DIR}/lib/${SwiftTesting_TestingMacrosLibraryName}"
-    # TODO: Finalize the install path
-    DESTINATION lib/swift/host/plugins)
 endif()

Sources/TestingMacros/CMakeLists.txt

@@ -60,16 +60,17 @@ else()
   add_library(TestingMacros SHARED)
 
   target_link_options(TestingMacros PRIVATE "-no-toolchain-stdlib-rpath")
-  # Not setting RPATH requires all the dependencies are already loaded in the
-  # process, because 'plugin' directory wouldn't contain any dependencies.
+  # Not setting RPATH means it requires all the dependencies are already loaded
+  # in the process, because 'plugin' directory wouldn't contain any dependencies.
   set_property(TARGET TestingMacros PROPERTY INSTALL_RPATH)
 
-  # Install the macro plugin to the default location.
-  #
-  # This is not the plugin's actual, final install location -- it's only
-  # relative to this external project's install dir. The final location is
-  # determined by the "outer" project.
-  install(TARGETS TestingMacros)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    install(TARGETS TestingMacros
+      RUNTIME DESTINATION bin)
+  else()
+    # Other platforms, TestingMacros is installed by the parent project.
+    install(TARGETS TestingMacros)
+  endif()
 endif()
 
 target_sources(TestingMacros PRIVATE

cmake/modules/SwiftModuleInstallation.cmake

@@ -28,9 +28,19 @@ function(_swift_testing_install_target module)
     set(swift swift)
   endif()
 
+  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(lib_destination_dir "lib/${swift}/${swift_os}/testing")
+    set_property(TARGET ${module} PROPERTY
+      INSTALL_RPATH "@loader_path/..")
+  else()
+    set(lib_destination_dir "lib/${swift}/${swift_os}")
+    set_property(TARGET ${module} PROPERTY
+      INSTALL_RPATH "$ORIGIN")
+  endif()
+
   install(TARGETS ${module}
-    ARCHIVE DESTINATION lib/${swift}/${swift_os}
-    LIBRARY DESTINATION lib/${swift}/${swift_os}
+    ARCHIVE DESTINATION "${lib_destination_dir}"
+    LIBRARY DESTINATION "${lib_destination_dir}"
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
   if(type STREQUAL EXECUTABLE)
     return()
@@ -52,13 +62,17 @@ function(_swift_testing_install_target module)
     mark_as_advanced(SwiftTesting_MODULE_TRIPLE)
   endif()
 
+  set(module_dir "${lib_destination_dir}/${module_name}.swiftmodule")
   install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftdoc
-    DESTINATION lib/${swift}/${swift_os}/${module_name}.swiftmodule
+    DESTINATION "${module_dir}"
     RENAME ${SwiftTesting_MODULE_TRIPLE}.swiftdoc)
   install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftmodule
-    DESTINATION lib/${swift}/${swift_os}/${module_name}.swiftmodule
+    DESTINATION "${module_dir}"
     RENAME ${SwiftTesting_MODULE_TRIPLE}.swiftmodule)
-  install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftinterface
-    DESTINATION lib/${swift}/${swift_os}/${module_name}.swiftmodule
-    RENAME ${SwiftTesting_MODULE_TRIPLE}.swiftinterface)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    # Only Darwin has stable ABI. 
+    install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftinterface
+      DESTINATION "${module_dir}"
+      RENAME ${SwiftTesting_MODULE_TRIPLE}.swiftinterface)
+  endif()
 endfunction()