Skip to content

Update/Fix CMake build #65

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
Jan 29, 2021
Merged

Update/Fix CMake build #65

merged 2 commits into from
Jan 29, 2021

Conversation

yim-lee
Copy link
Member

@yim-lee yim-lee commented Jan 28, 2021

Motivation:
SwiftPM's CMake build
(swiftlang/swift-package-manager#3202) unsuccessful
even with #60.

Modifications:

Result:
Successful CMake build.

Motivation:
SwiftPM's CMake build
(swiftlang/swift-package-manager#3202) unsuccessful
even with apple#60.

Modifications:
- Use consistent `SWIFT_CRYPTO_EXPORTS` naming. In some places `CRYPTO_EXPORTS` was used instead.
- Install `CCryptoBoringSSL` so we can import it in code (see swiftlang/swift-package-manager#3202)
- Always set `BUILD_SHARED_LIBS`

Result:
Successful CMake build.
yim-lee added a commit to yim-lee/swift-package-manager that referenced this pull request Jan 28, 2021
@tomerd
Copy link
Member

tomerd commented Jan 28, 2021

@compnerd ptal

@compnerd
Copy link
Contributor

Hmm, does the client need to link against CCryptoBoringSSL or just import it? (that is, it needs the headers and the module map?) Installation of just the library would be insufficient for that. In fact, if the module is needed because it is a dependency for the rest of the code, I think that the better thing might be to use it as @_implementationOnly.

@compnerd
Copy link
Contributor

Just to make sure I understand everything - this is just a renaming of the exports file and nothing more?

@yim-lee
Copy link
Member Author

yim-lee commented Jan 29, 2021

Not installing CCryptBoringSSL seems ok actually, or at least I can't get it to fail anymore, so I backed out that part of the changeset.

@yim-lee
Copy link
Member Author

yim-lee commented Jan 29, 2021

this is just a renaming of the exports file and nothing more

This is renaming exports file and vars plus always setting BUILD_SHARED_LIBS to YES.

Copy link
Contributor

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

LGTM

@tomerd
Copy link
Member

tomerd commented Jan 29, 2021

@Lukasa good to merge?

@Lukasa Lukasa merged commit 42f5ffe into apple:main Jan 29, 2021
yim-lee added a commit to yim-lee/swift-package-manager that referenced this pull request Feb 3, 2021
yim-lee added a commit to yim-lee/swift-package-manager that referenced this pull request Feb 4, 2021
yim-lee added a commit to swiftlang/swift-package-manager that referenced this pull request Feb 5, 2021
Motivation:
Package collections feature will require swift-crypto dependency.

Modifications:
- Add swift-crypto dependency
- Bump minimum macOS version to 10.15, for it's required by swift-crypto

Requires apple/swift-crypto#65
@yim-lee yim-lee deleted the fix-cmake-build branch February 5, 2021 21:44
rnro added a commit to rnro/swift-crypto that referenced this pull request Mar 26, 2025
Rename nightly_6_1 params to nightly_next; see
apple/swift-nio#3122
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