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: Revert CMake's way to handle definitions #269

Merged
merged 6 commits into from
Jul 23, 2024

Conversation

hebasto
Copy link
Owner

@hebasto hebasto commented Jul 18, 2024

This PR adjusts CMake scripts in such a way that makes removing #include <config/bitcoin-config.h> from sources is unnecessary.

Effectively, this makes Autotools and CMake builds comparable.

Addresses bitcoin#30454 (comment) and bitcoin#30454 (comment).

@hebasto
Copy link
Owner Author

hebasto commented Jul 18, 2024

Friendly ping @maflcko @theuni @fanquake @TheCharlatan :)

@theuni
Copy link

theuni commented Jul 18, 2024

Are these going to remain as reverts on top of the original changes?

@hebasto
Copy link
Owner Author

hebasto commented Jul 18, 2024

Are these going to remain as reverts on top of the original changes?

No. I'm going to squash these commits with the past relevant commits during the next sync/rebase round.

@hebasto
Copy link
Owner Author

hebasto commented Jul 18, 2024

Rebased on top of the merged #268.

@hebasto
Copy link
Owner Author

hebasto commented Jul 19, 2024

Are these going to remain as reverts on top of the original changes?

No. I'm going to squash these commits with the past relevant commits during the next sync/rebase round.

The commit messages have been updated to reflect this intention.

Copy link

@theuni theuni left a comment

Choose a reason for hiding this comment

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

I believe this is correct. Hard to tell without doing a full rebase, but the only related code-change in the diff from pre-cmake is src/qt/guiutil.cpp, which had its bitcoin-config.h include removed for the static plugin change.

If there are any mistakes here, I think they'll be obvious post-rebase.

utACK f440d33

@hebasto hebasto merged commit d3a10e6 into cmake-staging Jul 23, 2024
39 of 40 checks passed
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.

2 participants