Fix fallout from "CMake: use object libraries" #2840
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
CMake Xcode generator does not seem to build libraries properly if we have both a Foo.cpp and a Foo.mm in one library.
This seems to be needed when object libraries are in use.
|
@swift-ci Please test |
|
@swift-ci Please smoke test |
| if (NOT "${DEP}" STREQUAL "icucore") | ||
| add_dependencies(${VARIANT_NAME} | ||
| "${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}") | ||
| message("${VARIANT_NAME} ${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}") |
There was a problem hiding this comment.
Note to self: remove this debug print.
gribozavr
force-pushed
the
cmake-use-object-libraries-fix-fallout
branch
from
583b57e to
83b9815
Compare
|
@swift-ci Please 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.
#2809 has caused unexpected regressions with the CMake Xcode generator, which this pull request fixes.
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
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.