build: stage the swiftmodule for build compatibility #216
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
|
@swift-ci please test |
modocache
approved these changes
Jun 14, 2018
There was a problem hiding this comment.
LGTM, but I would hold off on merging this until after swiftlang/swift#17180 builds successfully with Swift CI.
CMakeLists.txt
Outdated
| @@ -94,6 +94,20 @@ add_swift_library(XCTest | |||
| -I${XCTEST_PATH_TO_FOUNDATION_BUILD}/Foundation | |||
| -I${XCTEST_PATH_TO_FOUNDATION_BUILD}/Foundation/usr/lib/swift) | |||
|
|
|||
| # Temporary staging; the various swift projects that depend on XCTest all expect | |||
| # the swiftdoc and swiftmodule to be in the top level. | |||
| # So faor now, make a copy so we don't haev to do a coordinated commit across | |||
There was a problem hiding this comment.
Typo, should be "for now" and "have to"
Copy the swiftmodule and swiftdoc to the root of the build to permit building swiftpm in the swift build against the CMake build.
|
Going to merge this since it doesn't break anything but reduces the outstanding changes to switch s-c-f to CMake. |
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.
Copy the swiftmodule and swiftdoc to the root of the build to permit
building swiftpm in the swift build against the CMake build.