[Runtimes][CMake] Find Shims, OnoneSupport and Concurrency in FindSwi… #81982
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
…ftCore This way we will match most of the targets that would be exported via `SwiftCoreTargets.cmake`. Take the chance to amend the path to SwiftCore library for Windows. Addresses rdar://151700875
edymtt
requested review from
etcwilde,
compnerd and
justice-adams-apple
as code owners
|
@swift-ci please smoke test |
compnerd
reviewed
Jun 4, 2025
| INTERFACE_INCLUDE_DIRECTORIES "${Shims_INCLUDE_DIR}/shims") | ||
| target_link_libraries(swiftCore | ||
| INTERFACE | ||
| swiftShims) |
| find_path(Shims_INCLUDE_DIR | ||
| "shims/module.modulemap" | ||
| HINTS | ||
| "${Swift_SDKROOT}/usr/lib/swift") |
There was a problem hiding this comment.
Should we use ${Swift_SDKROOT}/usr/lib/swift_static as a primary hint?
| elseif(WIN32) | ||
| find_path(SwiftCore_INCLUDE_DIR | ||
| "Swift.swiftmodule" | ||
| HINTS | ||
| "${Swift_SDKROOT}/usr/lib/swift/windows" | ||
| "$ENV{SDKROOT}/usr/lib/swift/windows") | ||
| find_library(SwiftCore_LIBRARY | ||
| NAMES "libswiftCore.lib" | ||
| NAMES "swiftCore.lib" |
There was a problem hiding this comment.
This needs a if(BUILD_SHARED_LIBS) clause around this. The import library for swiftCore is swiftCore.lib, the static library is libswiftCore.lib.
edymtt
added a commit
to edymtt/swift
that referenced
this pull request
Jun 5, 2025
...instead of platforms. Assessing my understanding of swiftlang#81982 (review)
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.
…ftCore
This way we will match most of the targets that would be exported via
SwiftCoreTargets.cmake.Take the chance to amend the path to SwiftCore library for Windows.
Addresses rdar://151700875