[SourceKit] Register optional sources in CMake #2467
Merged
Conversation
This file contains hidden or 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
LLVM's CMake modules include a function `llvm_process_sources()`, which (among other things) verifies that all source files in a directory are either included in the list of source files to process, or are included in a list `LLVM_OPTIONAL_SOURCES`. SourceKit's CMake functions make use of this LLVM function, but do not register any files as "optional". When attempting to configure CMake to include SourceKit on a Linux host machine, source files that are only included on Darwin host machines cause this function to raise an error. Mark Darwin-only SourceKit files as "optional" to avoid the error.
|
@swift-ci Please test and merge |
|
CI failure is unrelated. |
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.
What's in this pull request?
LLVM's CMake modules include a function
llvm_process_sources(), which (among other things) verifies that all source files in a directory are either included in the list of source files to process, or are included in a listLLVM_OPTIONAL_SOURCES.SourceKit's CMake functions make use of this LLVM function, but do not register any files as "optional". When attempting to configure CMake to include SourceKit on a Linux host machine, source files that are only included on Darwin host machines cause this function to raise an error.
Mark Darwin-only SourceKit files as "optional" to avoid the error.
ResolvedRelated bug number: (SR-710)Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Note: Only members of the Apple organization can trigger swift-ci.