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

cmake: Port PR29723 from the master branch #278

Merged
merged 8 commits into from
Jul 24, 2024
Merged

Conversation

hebasto
Copy link
Owner

@hebasto hebasto commented Jul 23, 2024

This PR ports bitcoin#29723.

It aims to avoid conflicts when pushing the cmake-staging branch as an update of bitcoin#30454.

Also a documenting comment added in regard to bitcoin#30508.

hebasto and others added 8 commits July 23, 2024 21:49
The CMake WIN32_WINNT autodetection is broken, and must be set
manually. We may want to set is explicitly in any case, but the
brokenness should also be fixed upstream.

Also patch out depends paths, that would cause non-determinism.

Co-authored-by: fanquake <fanquake@gmail.com>
@hebasto hebasto added the port from autotools Ported from the main repository label Jul 23, 2024
Copy link

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

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

lgtm

@hebasto hebasto merged commit 7a59ed6 into cmake-staging Jul 24, 2024
39 of 40 checks passed
@m3dwards
Copy link

ACK 00355fd

Checked commits apply cleanly and built zeromq using cmake.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
port from autotools Ported from the main repository
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants