Install C and C++ libraries in the arch directory

* Update the C and C++ libraries to also install the arch
  sub-directory.
* Simplify the logic to gather the arch and triple data.

Author: Steelskin

Sources/CoreFoundation/CMakeLists.txt

@@ -148,7 +148,7 @@ install(DIRECTORY
 
 if(NOT BUILD_SHARED_LIBS)
     install(TARGETS CoreFoundation
-        ARCHIVE DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}
-        LIBRARY DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}
+        ARCHIVE DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}$<$<BOOL:${SwiftFoundation_INSTALL_ARCH_SUBDIR}>:/${SwiftFoundation_ARCH}>
+        LIBRARY DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}$<$<BOOL:${SwiftFoundation_INSTALL_ARCH_SUBDIR}>:/${SwiftFoundation_ARCH}>
         RUNTIME DESTINATION bin)
 endif()

Sources/_CFURLSessionInterface/CMakeLists.txt

@@ -37,7 +37,7 @@ target_link_libraries(_CFURLSessionInterface PRIVATE
 if(NOT BUILD_SHARED_LIBS)
     set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS _CFURLSessionInterface)
     install(TARGETS _CFURLSessionInterface
-        ARCHIVE DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}
-        LIBRARY DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}
+        ARCHIVE DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}$<$<BOOL:${SwiftFoundation_INSTALL_ARCH_SUBDIR}>:/${SwiftFoundation_ARCH}>
+        LIBRARY DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}$<$<BOOL:${SwiftFoundation_INSTALL_ARCH_SUBDIR}>:/${SwiftFoundation_ARCH}>
         RUNTIME DESTINATION bin)
 endif()

Sources/_CFXMLInterface/CMakeLists.txt

@@ -39,7 +39,7 @@ endif()
 if(NOT BUILD_SHARED_LIBS)
     set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS _CFXMLInterface)
     install(TARGETS _CFXMLInterface
-        ARCHIVE DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}
-        LIBRARY DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}
+        ARCHIVE DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}$<$<BOOL:${SwiftFoundation_INSTALL_ARCH_SUBDIR}>:/${SwiftFoundation_ARCH}>
+        LIBRARY DESTINATION lib/swift_static/${SwiftFoundation_PLATFORM}$<$<BOOL:${SwiftFoundation_INSTALL_ARCH_SUBDIR}>:/${SwiftFoundation_ARCH}>
         RUNTIME DESTINATION bin)
 endif()

Sources/plutil/CMakeLists.txt

@@ -23,7 +23,7 @@ target_link_libraries(plutil PRIVATE
 	Foundation)
 
 set_target_properties(plutil PROPERTIES
-	INSTALL_RPATH "$ORIGIN/../lib/swift/${SwiftFoundation_PLATFORM}")
+	INSTALL_RPATH "$ORIGIN/../lib/swift/${SwiftFoundation_PLATFORM}$<$<BOOL:${SwiftFoundation_INSTALL_ARCH_SUBDIR}>:/${SwiftFoundation_ARCH}>")
 
 set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS plutil)
 install(TARGETS plutil

cmake/modules/FoundationSwiftSupport.cmake

@@ -29,32 +29,16 @@ if(NOT SwiftFoundation_MODULE_TRIPLE)
 endif()
 
 if(NOT SwiftFoundation_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.
-    string(JSON module_arch GET "${target_info_json}" "target" "arch")
-  else()
-    # For older compilers, extract the value from `SwiftFoundation_MODULE_TRIPLE`.
-    string(REGEX MATCH "^[^-]+" module_arch "${SwiftFoundation_MODULE_TRIPLE}")
-  endif()
-
+  # Use the -print-target-info command to get the architecture.
+  string(JSON module_arch GET "${target_info_json}" "target" "arch")
   set(SwiftFoundation_ARCH "${module_arch}" CACHE STRING "Arch folder name used to install libraries")
   mark_as_advanced(SwiftFoundation_ARCH)
   message(CONFIGURE_LOG "Swift arch: ${SwiftFoundation_ARCH}")
 endif()
 
 if(NOT SwiftFoundation_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()
-
+  # Use the -print-target-info command to get the platform.
+  string(JSON swift_platform GET "${target_info_json}" "target" "platform")
   set(SwiftFoundation_PLATFORM "${swift_platform}" CACHE STRING "Platform folder name used to install libraries")
   mark_as_advanced(SwiftFoundation_PLATFORM)
   message(CONFIGURE_LOG "Swift platform: ${SwiftFoundation_PLATFORM}")