Merge pull request #79548 from etcwilde/ewilde/stdlib-rebuild-install-story

etcwilde · web-flow · commit 71f9aac6e3cc · 2025-02-26T09:53:02.000-08:00
CMake: SwiftCore Install Story
diff --git a/Runtimes/Core/CMakeLists.txt b/Runtimes/Core/CMakeLists.txt
@@ -144,7 +144,6 @@ add_compile_definitions(
   $<$<BOOL:${SwiftCore_ENABLE_OBJC_INTEROP}>:-DSWIFT_OBJC_INTEROP>
   $<$<BOOL:${SwiftCore_ENABLE_LIBRARY_EVOLUTION}>:-DSWIFT_LIBRARY_EVOLUTION>
   $<$<BOOL:${SwiftCore_ENABLE_CRASH_REPORTER_CLIENT}>:-DSWIFT_HAVE_CRASHREPORTERCLIENT>
-  $<$<BOOL:${SwiftCore_ENABLE_VECTOR_TYPES}>:-DSWIFT_STDLIB_ENABLE_VECTOR_TYPES>
   $<$<BOOL:${SwiftCore_ENABLE_REFLECTION}>:-DSWIFT_ENABLE_REFLECTION>
   $<$<BOOL:${SwiftCore_ENABLE_RUNTIME_FUNCTION_COUNTERS}>:-DSWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS>
   $<$<BOOL:${SwiftCore_ENABLE_STDIN}>:-DSWIFT_STDLIB_HAS_STDIN> # core + stubs
@@ -226,3 +225,22 @@ endif()
 if(SwiftCore_ENABLE_CONCURRENCY)
   add_subdirectory(Concurrency)
 endif()
+
+# Inter-project install info
+export(EXPORT SwiftCoreTargets
+  FILE "cmake/SwiftCore/SwiftCoreTargets.cmake")
+install(EXPORT SwiftCoreTargets
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCore"
+  FILE "SwiftCoreTargets.cmake"
+  COMPONENT SwiftCore_cmake)
+include(CMakePackageConfigHelpers)
+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/interface/SwiftCoreConfig.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCoreConfig.cmake"
+  INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCore")
+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCoreConfigVersion.cmake"
+  VERSION "${PROJECT_VERSION}"
+  COMPATIBILITY ExactVersion)
+install(FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCoreConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/SwiftCoreConfigVersion.cmake"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/SwiftCore")
diff --git a/Runtimes/Core/CommandLineSupport/CMakeLists.txt b/Runtimes/Core/CommandLineSupport/CMakeLists.txt
@@ -10,6 +10,8 @@ if(SwiftCore_ENABLE_COMMANDLINE_SUPPORT)
     swiftShims)
 
   if(NOT BUILD_SHARED_LIBS)
-    install(TARGETS swiftCommandLineSupport)
+    install(TARGETS swiftCommandLineSupport
+      EXPORT SwiftCoreTargets
+      COMPONENT SwiftCore_runtime)
   endif()
 endif()
diff --git a/Runtimes/Core/Concurrency/CMakeLists.txt b/Runtimes/Core/Concurrency/CMakeLists.txt
@@ -118,6 +118,8 @@ set_target_properties(swift_Concurrency PROPERTIES
   Swift_MODULE_NAME _Concurrency)
 
 install(TARGETS swift_Concurrency
+  EXPORT SwiftCoreTargets
+  COMPONENT SwiftCore_runtime
   ARCHIVE DESTINATION "${SwiftCore_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftCore_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/Runtimes/Core/Demangling/CMakeLists.txt b/Runtimes/Core/Demangling/CMakeLists.txt
@@ -48,5 +48,7 @@ if(LINUX OR BSD)
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
-  install(TARGETS swiftDemangling)
+  install(TARGETS swiftDemangling
+    EXPORT SwiftCoreTargets
+    COMPONENT SwiftCore_runtime)
 endif()
diff --git a/Runtimes/Core/LLVMSupport/CMakeLists.txt b/Runtimes/Core/LLVMSupport/CMakeLists.txt
@@ -8,3 +8,9 @@ add_library(swiftLLVMSupport OBJECT
 target_compile_options(swiftLLVMSupport
   PRIVATE
     $<$<BOOL:${SwiftCore_HAS_ASL}>:-DSWIFT_STDLIB_HAS_ASL>)
+
+if(NOT BUILD_SHARED_LIBS)
+  install(TARGETS swiftLLVMSupport
+    EXPORT SwiftCoreTargets
+    COMPONENT SwiftCore_runtime)
+endif()
diff --git a/Runtimes/Core/SwiftOnoneSupport/CMakeLists.txt b/Runtimes/Core/SwiftOnoneSupport/CMakeLists.txt
@@ -32,6 +32,8 @@ target_link_libraries(swiftSwiftOnoneSupport
     swiftCore)
 
 install(TARGETS swiftSwiftOnoneSupport
+    EXPORT SwiftCoreTargets
+    COMPONENT SwiftCore_runtime
     ARCHIVE DESTINATION "${SwiftCore_INSTALL_LIBDIR}"
     LIBRARY DESTINATION "${SwiftCore_INSTALL_LIBDIR}"
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/Runtimes/Core/SwiftShims/swift/shims/CMakeLists.txt b/Runtimes/Core/SwiftShims/swift/shims/CMakeLists.txt
@@ -28,14 +28,19 @@ install(FILES
   _SwiftDistributed.h
   _SynchronizationShims.h
   module.modulemap
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}/swift/shims")
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/swift/shims"
+  COMPONENT SwiftCore_development)
 
 add_library(swiftShims INTERFACE)
 target_include_directories(swiftShims INTERFACE
-  $<$<COMPILE_LANGUAGE:C,CXX>:${CMAKE_CURRENT_SOURCE_DIR}/../../>
-  $<$<COMPILE_LANGUAGE:Swift>:${CMAKE_CURRENT_SOURCE_DIR}>)
+  $<$<COMPILE_LANGUAGE:C,CXX>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../>$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_LIBDIR}>>
+  $<$<COMPILE_LANGUAGE:Swift>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_LIBDIR}/swift/shims>>)
 target_compile_definitions(swiftShims INTERFACE
   $<$<AND:$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>,$<COMPILE_LANGUAGE:C,CXX>>:SWIFT_STATIC_STDLIB>)
 target_compile_options(swiftShims INTERFACE
   "$<$<AND:$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xcc -DSWIFT_STATIC_STDLIB>"
-  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -fmodule-map-file=${CMAKE_CURRENT_SOURCE_DIR}/module.modulemap>")
+  "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -fmodule-map-file=$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/module.modulemap>$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_LIBDIR}/swift/shims/module.modulemap>>")
+
+install(TARGETS swiftShims
+  EXPORT SwiftCoreTargets
+  COMPONENT SwiftCore_development)
diff --git a/Runtimes/Core/Threading/CMakeLists.txt b/Runtimes/Core/Threading/CMakeLists.txt
@@ -13,3 +13,9 @@ target_link_libraries(swiftThreading PRIVATE swiftShims)
 #        to avoid pulling in headers from the compiler.
 target_include_directories(swiftThreading PRIVATE
   "${SwiftCore_SWIFTC_SOURCE_DIR}/include")
+
+if(NOT BUILD_SHARED_LIBS)
+  install(TARGETS swiftThreading
+    EXPORT SwiftCoreTargets
+    COMPONENT SwiftCore_runtime)
+endif()
diff --git a/Runtimes/Core/cmake/interface/SwiftCoreConfig.cmake.in b/Runtimes/Core/cmake/interface/SwiftCoreConfig.cmake.in
@@ -0,0 +1,6 @@
+@PACKAGE_INIT@
+include("${CMAKE_CURRENT_LIST_DIR}/SwiftCoreTargets.cmake")
+
+set(SwiftCore_ENABLE_LIBRARY_EVOLUTION @SwiftCore_ENABLE_LIBRARY_EVOLUTION@)
+
+set(SwiftCore_ENABLE_VECTOR_TYPES @SwiftCore_ENABLE_VECTOR_TYPES@)
diff --git a/Runtimes/Core/cmake/modules/EmitSwiftInterface.cmake b/Runtimes/Core/cmake/modules/EmitSwiftInterface.cmake
@@ -38,31 +38,36 @@ function(install_swift_interface target)
   # Install binary swift modules
   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
     RENAME "${SwiftCore_MODULE_TRIPLE}.swiftmodule"
-    DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+    DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+    COMPONENT SwiftCore_development)
   if(SwiftCore_VARIANT_MODULE_TRIPLE)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
       RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftmodule"
-      DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+      DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+      COMPONENT SwiftCore_development)
   endif()
 
   # Install Swift interfaces if library-evolution is enabled
   if(SwiftCore_ENABLE_LIBRARY_EVOLUTION)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
       RENAME "${SwiftCore_MODULE_TRIPLE}.swiftinterface"
-      DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
-
+      DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+      COMPONENT SwiftCore_development)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
       RENAME "${SwiftCore_MODULE_TRIPLE}.private.swiftinterface"
-      DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+      DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+      COMPONENT SwiftCore_development)
 
     # Install catalyst interface files
     if(SwiftCore_VARIANT_MODULE_TRIPLE)
       install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
         RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftinterface"
-        DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+        DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+        COMPONENT SwiftCore_development)
       install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
         RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
-        DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
+        DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
+        COMPONENT SwiftCore_development)
     endif()
   endif()
 endfunction()
diff --git a/Runtimes/Core/core/CMakeLists.txt b/Runtimes/Core/core/CMakeLists.txt
@@ -291,10 +291,13 @@ if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
     "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xllvm -sil-partial-specialization>")
 endif()
 
-target_compile_definitions(swiftCore PRIVATE
-  $<$<BOOL:${SwiftCore_ENABLE_REFLECTION}>:-DSWIFT_ENABLE_REFLECTION>
-  $<$<BOOL:${SwiftCore_ENABLE_COMPACT_ABSOLUTE_FUNCTION_POINTERS}>:-DSWIFT_COMPACT_ABSOLUTE_FUNCTION_POINTER>
-  $<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_TARGET_LIBRARY_NAME=swiftCore>)
+target_compile_definitions(swiftCore
+  PRIVATE
+    $<$<BOOL:${SwiftCore_ENABLE_REFLECTION}>:-DSWIFT_ENABLE_REFLECTION>
+    $<$<BOOL:${SwiftCore_ENABLE_COMPACT_ABSOLUTE_FUNCTION_POINTERS}>:-DSWIFT_COMPACT_ABSOLUTE_FUNCTION_POINTER>
+    $<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_TARGET_LIBRARY_NAME=swiftCore>
+  INTERFACE
+    $<$<BOOL:${SwiftCore_ENABLE_VECTOR_TYPES}>:-DSWIFT_STDLIB_ENABLE_VECTOR_TYPES>)
 target_compile_options(swiftCore PRIVATE
   "$<$<AND:$<BOOL:${BUILD_SHARED_LIBS}>,$<COMPILE_LANGUAGE:Swift>>:SHELL:-Xcc -DswiftCore_EXPORTS>")
 
@@ -303,10 +306,11 @@ target_link_libraries(swiftCore
     swiftRuntime
     swiftLLVMSupport
     swiftDemangling
-    swiftShims
     swiftStdlibStubs
     swiftThreading
-    $<$<NOT:$<PLATFORM_ID:Darwin>>:swiftrt$<$<PLATFORM_ID:Windows>:T>>)
+    $<$<NOT:$<PLATFORM_ID:Darwin>>:swiftrt$<$<PLATFORM_ID:Windows>:T>>
+  PUBLIC
+    swiftShims)
 target_link_options(swiftCore PRIVATE
   -nostartfiles)
 if(NOT POLICY CMP0157)
@@ -324,6 +328,8 @@ if(NOT ANDROID AND NOT APPLE AND NOT LINUX AND NOT WIN32 AND UNIX)
 endif()
 
 install(TARGETS swiftCore
+  EXPORT SwiftCoreTargets
+  COMPONENT SwiftCore_runtime
   ARCHIVE DESTINATION "${SwiftCore_INSTALL_LIBDIR}"
   LIBRARY DESTINATION "${SwiftCore_INSTALL_LIBDIR}"
   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/Runtimes/Core/runtime/CMakeLists.txt b/Runtimes/Core/runtime/CMakeLists.txt
@@ -102,6 +102,7 @@ target_compile_definitions(swiftRuntime
     $<$<BOOL:${SwiftCore_ENABLE_FILESYSTEM_SUPPORT}>:-DSWIFT_LIB_SUBDIR="${SwiftCore_PLATFORM_SUBDIR}">
     $<$<BOOL:${SwiftCore_ENABLE_FATALERROR_BACKTRACE}>:-DSWIFT_STDLIB_SUPPORTS_BACKTRACE_REPORTING>
   PUBLIC
+    $<$<BOOL:${SwiftCore_ENABLE_VECTOR_TYPES}>:-DSWIFT_STDLIB_ENABLE_VECTOR_TYPES>
     $<$<BOOL:${SwiftCore_ENABLE_OS_TRACE_LAZY_INIT}>:-DSWIFT_USE_OS_TRACE_LAZY_INIT>)
 
 target_include_directories(swiftRuntime PRIVATE
@@ -143,6 +144,12 @@ if(SwiftCore_ENABLE_OBJC_INTEROP)
     ObjCRuntimeGetImageNameFromClass.mm)
 endif()
 
+if(NOT BUILD_SHARED_LIBS)
+  install(TARGETS swiftRuntime
+    EXPORT SwiftCoreTargets
+    COMPONENT SwiftCore_runtime)
+endif()
+
 string(TOLOWER "${SwiftCore_OBJECT_FORMAT}x" SwiftCore_OBJECT_FORMAT)
 if("${SwiftCore_OBJECT_FORMAT}" STREQUAL "elfx")
   add_library(swiftrt OBJECT SwiftRT-ELF-WASM.cpp)
@@ -155,6 +162,7 @@ if("${SwiftCore_OBJECT_FORMAT}" STREQUAL "elfx")
   # The driver requires that swifrt.o is under `usr/lib/swift/<platform>/<arch>`
   # Regardless of settings
   install(FILES $<TARGET_OBJECTS:swiftrt>
+    COMPONENT SwiftCore_runtime
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/swift/${SwiftCore_PLATFORM_SUBDIR}/${SwiftCore_ARCH_SUBDIR}"
     RENAME swiftrt.o)
 elseif("${SwiftCore_OBJECT_FORMAT}" STREQUAL "coffx")
@@ -169,6 +177,7 @@ elseif("${SwiftCore_OBJECT_FORMAT}" STREQUAL "coffx")
   add_library(swiftrt OBJECT SwiftRT-COFF.cpp)
   target_link_libraries(swiftrt PRIVATE swiftShims)
   install(FILES $<TARGET_OBJECTS:swiftrt>
+    COMPONENT SwiftCore_runtime
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/swift/${SwiftCore_PLATFORM_SUBDIR}/${SwiftCore_ARCH_SUBDIR}"
     RENAME swiftrt.obj)
 elseif(NOT "${SwiftCore_OBJECT_FORMAT}" STREQUAL "x")
diff --git a/Runtimes/Core/stubs/CMakeLists.txt b/Runtimes/Core/stubs/CMakeLists.txt
@@ -58,3 +58,9 @@ if(APPLE)
                APPEND_STRING
                PROPERTY COMPILE_FLAGS "-fobjc-arc")
 endif()
+
+if(NOT BUILD_SHARED_LIBS)
+  install(TARGETS swiftStdlibStubs
+    EXPORT SwiftCoreTargets
+    COMPONENT SwiftCore_runtime)
+endif()
