Get the platform name from the compiler

This also refactors the code so we only do a single call to the Swift compiler to gather the target info JSON.

Author: Steelskin

CMakeLists.txt

@@ -308,15 +308,7 @@ add_compile_definitions($<$<COMPILE_LANGUAGE:C,CXX>:HAVE_CONFIG_H>)
 if(ENABLE_SWIFT)
  include(SwiftSupport)
 
- if(NOT SWIFT_SYSTEM_NAME)
- if(APPLE)
- set(SWIFT_SYSTEM_NAME macosx)
- else()
- set(SWIFT_SYSTEM_NAME "$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>")
- endif()
- endif()
-
- set(INSTALL_TARGET_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${SWIFT_SYSTEM_NAME}/${dispatch_Swift_ARCH}" CACHE PATH "Path where the libraries will be installed")
+ set(INSTALL_TARGET_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${dispatch_Swift_PLATFORM}/${dispatch_Swift_ARCH}" CACHE PATH "Path where the libraries will be installed")
  set(INSTALL_DISPATCH_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/dispatch" CACHE PATH "Path where the headers will be installed for libdispatch")
  set(INSTALL_BLOCK_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/Block" CACHE PATH "Path where the headers will be installed for the blocks runtime")
  set(INSTALL_OS_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/os" CACHE PATH "Path where the os/ headers will be installed")

cmake/modules/SwiftSupport.cmake

@@ -1,60 +1,67 @@
 include_guard()
 
-if(NOT dispatch_MODULE_TRIPLE)
+if(NOT dispatch_Swift_MODULE_TRIPLE OR NOT dispatch_Swift_ARCH OR NOT dispatch_Swift_SYSTEM)
+ # Get the target information from the Swift compiler.
  set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
  if(CMAKE_Swift_COMPILER_TARGET)
  list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET})
  endif()
  execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
+endif()
 
+if(NOT dispatch_Swift_MODULE_TRIPLE)
  string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple")
- set(dispatch_MODULE_TRIPLE "${module_triple}" CACHE STRING "Triple used to install swiftmodule files")
- mark_as_advanced(dispatch_MODULE_TRIPLE)
-
+ set(dispatch_Swift_MODULE_TRIPLE "${module_triple}" CACHE STRING "Triple used to install swiftmodule files")
+ mark_as_advanced(dispatch_Swift_MODULE_TRIPLE)
  message(CONFIGURE_LOG "Swift module triple: ${module_triple}")
 endif()
 
 if(NOT dispatch_Swift_ARCH)
  if(CMAKE_Swift_COMPILER_VERSION VERSION_EQUAL 0.0.0 OR CMAKE_Swift_COMPILER_VERSION VERSION_GREATER_EQUAL 6.2)
  # For newer compilers, we can use the -print-target-info command to get the architecture.
- set(module_arch_command "${CMAKE_Swift_COMPILER}" -print-target-info)
- if(CMAKE_Swift_COMPILER_TARGET)
- list(APPEND module_arch_command -target ${CMAKE_Swift_COMPILER_TARGET})
- endif()
- execute_process(COMMAND ${module_arch_command} OUTPUT_VARIABLE target_info_json)
  string(JSON module_arch GET "${target_info_json}" "target" "arch")
  else()
- # For older compilers, extract the value from `dispatch_MODULE_TRIPLE`.
- string(REGEX MATCH "^[^-]+" module_arch "${dispatch_MODULE_TRIPLE}")
+ # For older compilers, extract the value from `dispatch_Swift_MODULE_TRIPLE`.
+ string(REGEX MATCH "^[^-]+" module_arch "${dispatch_Swift_MODULE_TRIPLE}")
  endif()
 
  set(dispatch_Swift_ARCH "${module_arch}" CACHE STRING "Arch folder name used to install libraries")
  mark_as_advanced(dispatch_Swift_ARCH)
-
  message(CONFIGURE_LOG "Swift arch: ${dispatch_Swift_ARCH}")
 endif()
 
+if(NOT dispatch_Swift_PLATFORM)
+ if(CMAKE_Swift_COMPILER_VERSION VERSION_EQUAL 0.0.0 OR CMAKE_Swift_COMPILER_VERSION VERSION_GREATER_EQUAL 6.2)
+ # For newer compilers, we can use the -print-target-info command to get the platform.
+ string(JSON swift_platform GET "${target_info_json}" "target" "platform")
+ else()
+ # For older compilers, compile the value from `CMAKE_SYSTEM_NAME`.
+ if(APPLE)
+ set(swift_platform macosx)
+ else()
+ set(swift_platform "$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>")
+ endif()
+ endif()
+
+ set(dispatch_Swift_PLATFORM "${swift_platform}" CACHE STRING "Platform folder name used to install libraries")
+ mark_as_advanced(dispatch_Swift_PLATFORM)
+ message(CONFIGURE_LOG "Swift platform: ${dispatch_Swift_PLATFORM}")
+endif()
+
 function(install_swift_module target)
  get_target_property(module ${target} Swift_MODULE_NAME)
  if(NOT module)
  set(module ${target})
  endif()
 
- if(NOT SWIFT_SYSTEM_NAME)
- if(APPLE)
- set(SWIFT_SYSTEM_NAME macosx)
- else()
- set(SWIFT_SYSTEM_NAME "$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>")
- endif()
- endif()
- set(INSTALL_SWIFT_MODULE_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${SWIFT_SYSTEM_NAME}" CACHE PATH "Path where the swift modules will be installed")
+ set(INSTALL_SWIFT_MODULE_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/${dispatch_Swift_PLATFORM}" CACHE PATH "Path where the swift modules will be installed")
 
  install(
  FILES $<TARGET_PROPERTY:${target},Swift_MODULE_DIRECTORY>/${module}.swiftdoc
  DESTINATION ${INSTALL_SWIFT_MODULE_DIR}/${module}.swiftmodule
- RENAME ${dispatch_MODULE_TRIPLE}.swiftdoc)
+ RENAME ${dispatch_Swift_MODULE_TRIPLE}.swiftdoc)
  install(
  FILES $<TARGET_PROPERTY:${target},Swift_MODULE_DIRECTORY>/${module}.swiftmodule
  DESTINATION ${INSTALL_SWIFT_MODULE_DIR}/${module}.swiftmodule
- RENAME ${dispatch_MODULE_TRIPLE}.swiftmodule)
+ RENAME ${dispatch_Swift_MODULE_TRIPLE}.swiftmodule)
 endfunction()