Swift 3.0 branch cmake overlay dependencies #5032
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
Contributor
Author
|
@swift-ci Please test |
Contributor
Author
|
@zisko Please review. |
Contributor
|
Looks good to me, I'm going to run a clean build of this on a fast machine to verify. |
added 2 commits
September 28, 2016 12:56
…erlays are added the build breaks. There's already a tool to get proper dependencies, `utils/find-overlay-dependencies.sh`, so this patch allows that tool to update the `CMakeLists.txt` files in-place. Also it adds a line to the `CMakeLists.txt` files for each SDK so that the tool works.
os/activity.h or os/log.h. Update cmake files again, hardcoding a Darwin dependency. The script does not notice that Foundation depends on CoreGraphics, so add that manually. Also found that MapKit is supported on WATCHOS but we didn't have dependencies for that. Favor one line per supported SDK instead of catch-all dependency lines. Distinguish from SDKs which have no dependencies vs SDKs which are unsupported on a particular platform by printing `unsupported` to the console and remove the line in the cmake file because it should not exist anyway. This full cleanup was not done before because of circularity detected by the util, which has since been fixed. Support directories with spaces.
erg
force-pushed
the
swift-3.0-branch-cmake-overlays
branch
from
3d98ec2 to
f5da06d
Compare
Contributor
Author
|
@swift-ci Please test |
3 similar comments
Contributor
Author
|
@swift-ci Please test |
Contributor
Author
|
@swift-ci Please test |
Contributor
Author
|
@swift-ci Please test |
Contributor
|
Build failed |
Contributor
Author
|
@swift-ci Please test OS X platform |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 explicitly lists all overlay dependencies in the cmake files and adds a script to update them thus making the build more correct.
Resolves: rdar://problem/28501090
Risk: Low, only touches cmake files and a utils/ script that does not run automatically