CMake: SwiftCore Install Story #79548
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
etcwilde
requested review from
compnerd,
edymtt and
justice-adams-apple
as code owners
|
@swift-ci please smoke test |
compnerd
approved these changes
Feb 22, 2025
Runtimes/Core/CMakeLists.txt
Outdated
| FILE "SwiftCoreTargets.cmake" | ||
| COMPONENT SwiftCore_cmake) | ||
| include(CMakePackageConfigHelpers) | ||
| configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/installer/SwiftCoreConfig.cmake.in" |
There was a problem hiding this comment.
Can we use a different name than "installer"? We currently have the macOS and Windows installers, and this can be confusing as to how they are related.
There was a problem hiding this comment.
changed to cmake/interface/SwiftCoreConfig.cmake.in.
etcwilde
force-pushed
the
ewilde/stdlib-rebuild-install-story
branch
from
5124e7c to
37512a1
Compare
|
@swift-ci please smoke test |
compnerd
approved these changes
Feb 22, 2025
|
@swift-ci please smoke test |
Starting to work on a full installation story for the Swift runtimes. This involves generating the SwiftCoreConfig cmake files to allow importing the just-built runtimes into the overlays and supplemental libraries, setting up the flags appropriately for the given SwiftCore build configuration. This also separates out the development and runtime components to allow installing just the runtimes without the headers. Component List: - SwiftCore_runtime The runtime libraries that are required for running code. - SwiftCore_development The interface with the runtime libraries that are required for building code against the runtimes. - SwiftCore_cmake Files for interfacing CMake projects with the built runtimes. This includes the target list and flags needed to use the targets built by the specific configuration used to build the runtime libraries. These files are used for mapping flags, definitions, and locations into the overlay libraries and supplemental libraries. This adds install commands for the object libraries contributing to libswiftCore so that they are represented in SwiftCoreTargets.cmake. Object libraries do not contribute anything to the files actually installed.
etcwilde
force-pushed
the
ewilde/stdlib-rebuild-install-story
branch
from
37512a1 to
7870db6
Compare
|
Windows bot caught something. Neat. |
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding an installation story, complete with a generated
SwiftCoreConfig.cmakefile that allows pulling the just-built standard library into the downstream projects usingfind_package(SwiftCore). This will make it easier to ensure that the overlays and supplemental libraries are built against the expected runtimes.This also separates out the development and runtime components to allow
installing just the runtimes without the headers.
Component List:
The runtime libraries that are required for running code.
These are the files needed to interface with the standard library while doing development.
These include the shims headers as well as the swift modules and swift interfaces.
Files for interfacing CMake projects with the built runtimes.
This includes the target list and flags needed to use the targets
built by the specific configuration used to build the runtime
libraries.
These files are used for mapping flags, definitions, and locations
into the overlay libraries and supplemental libraries.
Note
We will need to clean up how we find shims. As it stands today, if the Swift shims are copied into the build directory next to the compiler as the current builds are, those will be picked up in addition to the shims from the standard library resulting in build failures due to duplicate
SwiftShimsmodules. Still looking for a way around that.