Skip to content

build: add a workaround for CMake 3.20 #38984

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 2 commits into from
Aug 20, 2021

Conversation

compnerd
Copy link
Member

CMake 3.20 had a bug on the release where the user supplied paths would
be processed without conversion. This adds a workaround by using
cygpath to convert the path to a mixed model style which should avoid
the problem.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

CMake 3.20 had a bug on the release where the user supplied paths would
be processed without conversion.  This adds a workaround by using
`cygpath` to convert the path to a mixed model style which should avoid
the problem.
@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

CC: @drodriguez

@compnerd
Copy link
Member Author

@swift-ci please smoke test

@shahmishal shahmishal merged commit 107afd6 into swiftlang:main Aug 20, 2021
@compnerd compnerd deleted the cmake-workaround branch August 20, 2021 23:16
@drodriguez
Copy link
Contributor

The change looks fine.

Just a warning: I think the newlines of the file had changed. If I remember correctly, *.bat files needed to be CRLF for some reason. It seems to be working fine in CI, but if something strange starts to happen, maybe switching back to CRLF might fix it.

@compnerd
Copy link
Member Author

@drodriguez thanks for that careful review! I've put up #38992 to ensure that this problem doesn't happen.

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.

3 participants