Skip to content
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

Fix CMakeLists.txt for Windows #326

Merged
merged 12 commits into from
Feb 14, 2025
Merged

Fix CMakeLists.txt for Windows #326

merged 12 commits into from
Feb 14, 2025

Conversation

cmcgee1024
Copy link
Contributor

@cmcgee1024 cmcgee1024 commented Feb 11, 2025

This change prepares swift-crypto for use on Windows with CMake and also the Package.swift for use in the Swift toolchain CI system.

Checklist

  • I've run tests to see all new and existing tests pass
  • I've followed the code style of the rest of the project
  • I've read the Contribution Guidelines
  • I've updated the documentation if necessary

If you've made changes to gyb files

  • I've run .script/generate_boilerplate_files_with_gyb and included updated generated files in a commit of this pull request

Motivation:

Upgrading swift-crypto from an older version requires that Windows works properly with CMake, and also SwiftPM.

Modifications:

Modify the CMakeLists.txt files and the generator script so that it conditionally adds assembly files for non-Windows platforms. Prepare the Package.swift file for use in Swift CI pipelines, by consulting an environment to either use the absolute URL, or a prepared version of the swift-asn1 dependency.

Result:

After this change it should be possible to build with the newest swift-crypto in the Swift CI system.

@cmcgee1024 cmcgee1024 changed the title Add more clarity to the comment in CMakeLists.txt Fix CMakeLists.txt for Windows Feb 12, 2025
@cmcgee1024 cmcgee1024 marked this pull request as ready for review February 14, 2025 01:24
@Lukasa Lukasa added the 🔨 semver/patch No public API change. label Feb 14, 2025
@Lukasa Lukasa merged commit b6049c0 into apple:main Feb 14, 2025
33 of 34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🔨 semver/patch No public API change.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants