Addressed more comments

Author: iCharlesHu

CMakeLists.txt

@@ -64,7 +64,9 @@ else()
         GIT_REPOSITORY https://github.com/apple/swift-collections.git
         GIT_TAG release/1.1)
 endif()
-FetchContent_MakeAvailable(SwiftCollections SwiftFoundationICU)
+FetchContent_MakeAvailable(SwiftFoundationICU SwiftCollections)
+
+list(APPEND CMAKE_MODULE_PATH ${SwiftFoundation_SOURCE_DIR}/cmake/modules)
 
 # Availability Macros (only applies to FoundationEssentials and FoundationInternationalization)
 set(_SwiftFoundation_availability_macros)
@@ -82,8 +84,7 @@ list(APPEND _SwiftFoundation_availability_macros
     "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend \"AvailabilityMacro=FoundationPredicateRegex 0.3:macOS 10000, iOS 10000, tvOS 10000, watchOS 10000\">"
     "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend \"AvailabilityMacro=FoundationPredicateRegex 0.4:macOS 10000, iOS 10000, tvOS 10000, watchOS 10000\">")
 
-list(APPEND CMAKE_MODULE_PATH ${SwiftFoundation_SOURCE_DIR}/cmake/modules)
-include(SwiftSupport)
+include(SwiftFoundationSwiftSupport)
 
 add_subdirectory(Sources)
 add_subdirectory(cmake/modules)

Package.swift

@@ -59,7 +59,7 @@ let package = Package(
             exact: "0.0.8"),
         .package(
             url: "https://github.com/apple/swift-syntax.git",
-            from: "510.0.0")
+            from: "600.0.0-latest")
     ],
     targets: [
         // Foundation (umbrella)

Sources/FoundationEssentials/CMakeLists.txt

@@ -74,4 +74,4 @@ set_target_properties(FoundationEssentials PROPERTIES
     INSTALL_RPATH "$ORIGIN")
 
 set_property(GLOBAL APPEND PROPERTY SWIFT_FOUNDATION_EXPORTS FoundationEssentials)
-_install_target(FoundationEssentials)
+_swift_foundation_install_target(FoundationEssentials)

Sources/FoundationInternationalization/CMakeLists.txt

@@ -43,4 +43,4 @@ set_target_properties(FoundationInternationalization PROPERTIES
     INSTALL_RPATH "$ORIGIN")
 
 set_property(GLOBAL APPEND PROPERTY SWIFT_FOUNDATION_EXPORTS FoundationInternationalization)
-_install_target(FoundationInternationalization)
+_swift_foundation_install_target(FoundationInternationalization)

Sources/FoundationMacros/CMakeLists.txt

@@ -19,7 +19,7 @@ if(NOT SwiftSyntax_FOUND)
     # If building at desk, check out and link against the SwiftSyntax repo's targets
     FetchContent_Declare(SwiftSyntax
         GIT_REPOSITORY https://github.com/apple/swift-syntax.git
-        GIT_TAG 510.0.0)
+        GIT_TAG 4c6cc0a3b9e8f14b3ae2307c5ccae4de6167ac2c) # 600.0.0-prerelease-2024-06-12
     FetchContent_MakeAvailable(SwiftSyntax)
 endif()
 

cmake/modules/SwiftFoundationSwiftSupport.cmake

@@ -0,0 +1,54 @@
+# Returns the os name in a variable
+#
+# Usage:
+#   get_swift_host_os(result_var_name)
+#
+#
+# Sets ${result_var_name} with the converted OS name derived from
+# CMAKE_SYSTEM_NAME.
+function(get_swift_host_os result_var_name)
+  set(${result_var_name} ${SWIFT_SYSTEM_NAME} PARENT_SCOPE)
+endfunction()
+
+function(_swift_foundation_install_target module)
+  get_swift_host_os(swift_os)
+  get_target_property(type ${module} TYPE)
+
+  if(type STREQUAL STATIC_LIBRARY)
+    set(swift swift_static)
+  else()
+    set(swift swift)
+  endif()
+
+  install(TARGETS ${module}
+    ARCHIVE DESTINATION lib/${swift}/${swift_os}
+    LIBRARY DESTINATION lib/${swift}/${swift_os}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+  if(type STREQUAL EXECUTABLE)
+    return()
+  endif()
+
+  get_target_property(module_name ${module} Swift_MODULE_NAME)
+  if(NOT module_name)
+    set(module_name ${module})
+  endif()
+
+  if(NOT SwiftFoundation_MODULE_TRIPLE)
+    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)
+    string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple")
+    set(SwiftFoundation_MODULE_TRIPLE "${module_triple}" CACHE STRING "swift module triple used for installed swiftmodule and swiftinterface files")
+    mark_as_advanced(SwiftFoundation_MODULE_TRIPLE)
+  endif()
+
+  install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftdoc
+    DESTINATION lib/${swift}/${swift_os}/${module_name}.swiftmodule
+    RENAME ${SwiftFoundation_MODULE_TRIPLE}.swiftdoc)
+  install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftmodule
+    DESTINATION lib/${swift}/${swift_os}/${module_name}.swiftmodule
+    RENAME ${SwiftFoundation_MODULE_TRIPLE}.swiftmodule)
+
+endfunction()