Addressed review comments and updated dependency URLs

Author: iCharlesHu

CMakeLists.txt

@@ -53,28 +53,26 @@ if (_SwiftFoundationICU_SourceDIR)
         SOURCE_DIR ${_SwiftFoundationICU_SourceDIR})
 else()
     FetchContent_Declare(SwiftFoundationICU
-        GIT_REPOSITORY https://github.com/iCharlesHu/swift-foundation-icu.git
-        GIT_TAG charles/cmake-support)
+        GIT_REPOSITORY https://github.com/apple/swift-foundation-icu.git
+        GIT_TAG 0.0.8)
 endif()
-FetchContent_MakeAvailable(SwiftFoundationICU)
 
 if (_SwiftFoundation_SourceDIR)
     FetchContent_Declare(SwiftFoundation
         SOURCE_DIR ${_SwiftFoundation_SourceDIR})
 else()
     FetchContent_Declare(SwiftFoundation
-        GIT_REPOSITORY https://github.com/iCharlesHu/swift-foundation.git
-        GIT_TAG charles/cmake-support)
+        GIT_REPOSITORY https://github.com/apple/swift-foundation.git
+        GIT_TAG main)
 endif()
-FetchContent_MakeAvailable(SwiftFoundation)
+FetchContent_MakeAvailable(SwiftFoundationICU SwiftFoundation)
 
 # System dependencies (fail fast if dependencies are missing)
 find_package(LibXml2 REQUIRED)
 find_package(CURL REQUIRED)
 find_package(dispatch CONFIG REQUIRED)
 
 # Common build flags (_CFURLSessionInterface, _CFXMLInterface, CoreFoundation)
-set(_Foundation_common_build_flags)
 list(APPEND _Foundation_common_build_flags
     "-DDEPLOYMENT_RUNTIME_SWIFT"
     "-DCF_BUILDING_CF"
@@ -112,7 +110,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
         "-I/usr/lib/swift") # dispatch
 endif()
 
-include(SwiftSupport)
+include(FoundationSwiftSupport)
 
 add_subdirectory(Sources)
 add_subdirectory(cmake/modules)

Sources/Foundation/CMakeLists.txt

@@ -165,4 +165,4 @@ target_link_libraries(Foundation PUBLIC
     swiftDispatch)
 
 set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS Foundation)
-_install_target(Foundation)
+_foundation_install_target(Foundation)

Sources/FoundationNetworking/CMakeLists.txt

@@ -51,14 +51,13 @@ target_compile_options(FoundationNetworking PRIVATE
 
 target_link_libraries(FoundationNetworking
     PRIVATE
-        Foundation
         CoreFoundation
         _CFURLSessionInterface
     PUBLIC
-        FoundationEssentials)
+        Foundation)
 
 set_target_properties(FoundationNetworking PROPERTIES
     INSTALL_RPATH "$ORIGIN")
 
 set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS FoundationNetworking)
-_install_target(FoundationNetworking)
+_foundation_install_target(FoundationNetworking)

Sources/FoundationXML/CMakeLists.txt

@@ -26,14 +26,13 @@ target_compile_options(FoundationXML PRIVATE
 
 target_link_libraries(FoundationXML
     PRIVATE
-        Foundation
         CoreFoundation
         _CFXMLInterface
     PUBLIC
-        FoundationEssentials)
+        Foundation)
 
 set_target_properties(FoundationXML PROPERTIES
     INSTALL_RPATH "$ORIGIN")
 
 set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS FoundationXML)
-_install_target(FoundationXML)
+_foundation_install_target(FoundationXML)

Sources/_CFURLSessionInterface/CMakeLists.txt

@@ -18,8 +18,7 @@ target_include_directories(_CFURLSessionInterface
     PUBLIC
         include
     PRIVATE
-        ../CoreFoundation/internalInclude
-        ../CoreFoundation/include)
+        ../CoreFoundation/internalInclude)
 
 target_precompile_headers(_CFURLSessionInterface PRIVATE ${CMAKE_SOURCE_DIR}/Sources/CoreFoundation/internalInclude/CoreFoundation_Prefix.h)
 

Sources/_CFXMLInterface/CMakeLists.txt

@@ -19,7 +19,6 @@ target_include_directories(_CFXMLInterface
         include
     PRIVATE
         ../CoreFoundation/internalInclude
-        ../CoreFoundation/include
         /usr/include/libxml2/)
 
 target_compile_options(_CFXMLInterface PRIVATE
@@ -32,4 +31,4 @@ target_link_libraries(_CFXMLInterface PRIVATE
 
 if(NOT BUILD_SHARED_LIBS)
     set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS _CFXMLInterface)
-endif()
+endif()

cmake/modules/FoundationSwiftSupport.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(_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()