Skip to content

build: synchronise CMake and Package.swift for Windows #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 24, 2020

Conversation

compnerd
Copy link
Member

Add the additional link dependency on Windows and a macro definition to
avoid some spew from the library build. Note that this is using an OS
specific block to alter the settings rather than the inline definition
since older versions of s-p-m may crash on the application of the
setting.

This requires bumping the tools version to 5.2.

Add the additional link dependency on Windows and a macro definition to
avoid some spew from the library build.  Note that this is using an OS
specific block to alter the settings rather than the inline definition
since older versions of s-p-m may crash on the application of the
setting.

This requires bumping the tools version to 5.2.
@compnerd
Copy link
Member Author

compnerd commented Aug 20, 2020

CC: @tomerd @egorzhdan

@compnerd
Copy link
Member Author

@swift-ci please test

@abertelrud
Copy link
Contributor

Seems that the Linux test is still using 5.1 tools:
'/home/buildnode/jenkins/workspace/pr-swift-tools-support-core-linux/branch-master/swift-tools-support-core' is using Swift tools version 5.2.0 but the installed version is 5.1.0

So that's not a problem with this PR but with the testing infrastructure. Not sure who maintains that and how we get it updated.

Copy link
Contributor

@abertelrud abertelrud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look good to me, but we also need to get the PR test infra updated to 5.2 (or ideally 5.3 now) to properly test this change.

@compnerd
Copy link
Member Author

@abertelrud please let me know if there’s anything that I can do to help with this. I think that this is going to be required to get a build of s-p-m on windows setup.

@tomerd
Copy link
Contributor

tomerd commented Aug 21, 2020

cc @shahmishal for CI issue

@abertelrud
Copy link
Contributor

Thanks; I have also filed a bug report on the CI testing issue.

@shahmishal
Copy link
Member

@swift-ci test

@abertelrud
Copy link
Contributor

Thanks for updating it so quickly, @shahmishal ! @compnerd, this can now be merged when you think it's appropriate.

@compnerd compnerd merged commit 60951f7 into swiftlang:master Aug 24, 2020
@compnerd compnerd deleted the build-configuration branch August 24, 2020 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants