Addressed more review comments

Author: iCharlesHu

Sources/CoreFoundation/CMakeLists.txt

@@ -117,23 +117,9 @@ target_link_libraries(CoreFoundation
         _FoundationICU
         dispatch)
 
-file(COPY
-        "include/module.map"
-    DESTINATION
-        ${CMAKE_BINARY_DIR}/CoreFoundationHeaders
-    NO_SOURCE_PERMISSIONS)
-
-
-file(GLOB_RECURSE _CoreFoundationPublicHeaders "include/*.h")
-file(COPY
-        ${_CoreFoundationPublicHeaders}
-    DESTINATION
-        ${CMAKE_BINARY_DIR}/CoreFoundationHeaders
-    NO_SOURCE_PERMISSIONS)
-
 set_property(GLOBAL APPEND PROPERTY Foundation_EXPORTS CoreFoundation)
 
 install(DIRECTORY
-            ${CMAKE_BINARY_DIR}/CoreFoundationHeaders/
+            include/
         DESTINATION
             lib/swift/CoreFoundation)

Sources/CoreFoundation/include/module.map

@@ -157,9 +157,7 @@ target_link_libraries(Foundation
 
 set_target_properties(Foundation PROPERTIES
     INSTALL_RPATH "$ORIGIN"
-    BUILD_RPATH "$<TARGET_FILE_DIR:swiftDispatch>"
-    Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift
-    INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/swift)
+    BUILD_RPATH "$<TARGET_FILE_DIR:swiftDispatch>")
 
 target_link_libraries(Foundation PUBLIC
     swiftDispatch)

Sources/Foundation/CMakeLists.txt

@@ -1,17 +1,19 @@
-# 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()
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the Swift open source project
+##
+## Copyright (c) 2024 Apple Inc. and the Swift project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.md for the list of Swift project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
 
 function(_foundation_install_target module)
-  get_swift_host_os(swift_os)
+  set(swift_os ${SWIFT_SYSTEM_NAME})
   get_target_property(type ${module} TYPE)
 
   if(type STREQUAL STATIC_LIBRARY)