Explicitly export ICU and Collections symbols from SwiftFoundation

Author: iCharlesHu

Sources/FoundationInternationalization/CMakeLists.txt

@@ -20,9 +20,9 @@ target_compile_options(FoundationInternationalization PRIVATE
 target_compile_options(FoundationInternationalization PRIVATE ${_SwiftFoundation_availability_macros})
 target_compile_options(FoundationInternationalization PRIVATE -package-name "SwiftFoundation")
 
-target_link_libraries(FoundationInternationalization PRIVATE
-    _CShims
+target_link_libraries(FoundationInternationalization PUBLIC
     FoundationEssentials
+    _CShims
     _FoundationICU)
 
 set_target_properties(FoundationInternationalization PROPERTIES

Sources/_CShims/CMakeLists.txt

@@ -23,3 +23,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
 endif()
 
 set_property(GLOBAL APPEND PROPERTY SWIFT_FOUNDATION_EXPORTS _CShims)
+
+if(BUILD_SHARED_LIBS)
+    set(install_directory swift)
+else()
+    set(install_directory swift_static)
+endif()
+
+# Install headers
+install(DIRECTORY
+            include/
+        DESTINATION
+            lib/${install_directory}/_CShims)
+

cmake/modules/CMakeLists.txt

@@ -13,6 +13,8 @@
 ##===----------------------------------------------------------------------===##
 
 set(SWIFT_FOUNDATION_EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/SwiftFoundationExports.cmake)
+set(SWIFT_FOUNDATION_ICU_EXPORTS_FILE ${SwiftFoundationICU_BINARY_DIR}/cmake/modules/SwiftFoundationICUExports.cmake)
+set(SWIFT_COLLECTIONS_EXPORTS_FILE ${SwiftCollections_BINARY_DIR}/cmake/modules/SwiftCollectionsExports.cmake)
 
 configure_file(SwiftFoundationConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/SwiftFoundationConfig.cmake)

cmake/modules/SwiftFoundationConfig.cmake.in

@@ -13,5 +13,7 @@
 ##===----------------------------------------------------------------------===##
 
 if(NOT TARGET SwiftFoundation)
+    include(@SWIFT_FOUNDATION_ICU_EXPORTS_FILE@)
+    include(@SWIFT_COLLECTIONS_EXPORTS_FILE@)
     include(@SWIFT_FOUNDATION_EXPORTS_FILE@)
 endif()