[cmake] Provide private extension points to the build #77507
Merged
+30
−4
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
Adding a macro to tie non-boolean variables into the defaulting mechanism.
Adding documentation on the behavior of the `defaulted_option` and `defaulted_set` macros.
etcwilde
requested review from
drodriguez,
compnerd,
mikeash and
justice-adams-apple
|
@swift-ci please test |
compnerd
approved these changes
Nov 9, 2024
Runtimes/Core/CMakeLists.txt
Outdated
| # Allowed extension points: | ||
| # - DefaultSettings.cmake | ||
| # - Settings.cmake | ||
| set(SwiftCore_PRIVATE_MODULE_DIR "${SwiftCore_CMAKE_MODULES_DIR}/private" |
There was a problem hiding this comment.
What do you think of SwiftCore_VENDOR_MODULE_DIR? This is the vendor specific settings and makes it clear when you concatenate them even if you don't know what it is (e.g. ${SwiftCore_VENDOR_MODULE_DIR}/DefaultSettings.cmake vs ${SwiftCore_PRIVATE_MODULE_DIR}/DefaultSettings.cmake).
There was a problem hiding this comment.
Sure, sounds good to me
Adding vendor-specific extension points to the build system, giving vendors a place to put their internal settings and defaults, without having to modify the build directly. This helps reduce the chances of merge conflicts and public changes breaking internal settings. The location of the macros are set with `SwiftCore_PRIVATE_MODULE_DIR`, so vendors can keep their private extensions in a separate location if desired. Otherwise, it defaults to `cmake/modules/private`, which intentionally does not exist at this time. Currently, we have extensions for the default settings and global settings.
etcwilde
force-pushed
the
ewilde/stdlib-rebuild-private-extension-points
branch
from
eb80255
to
2df8a18
Compare
|
@swift-ci please smoke test |
|
@swift-ci please smoke test Linux |
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.
This patch provides extension points on the build system so that vendors can keep vendor-specific build system settings private, without having to worry about merge conflicts haunting them for the rest of time.
The location of the extension modules is set with the
SwiftCore_PRIVATE_MODULE_DIRvariable. If it is not specified, the default location is undercmake/modules/private.Currently, there are extension points for the default settings, and for the global settings.