forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 4
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: Regular rebasing of the cmake-staging
branch
#186
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also add a sanity check for non-encapsulated (directory-wide) build properties.
Co-authored-by: Cory Fields <cory-nospam-@coryfields.com> Co-authored-by: Vasil Dimov <vd@FreeBSD.org>
Co-authored-by: Cory Fields <cory-nospam-@coryfields.com>
If any of {C,CXX,CPP,LD}FLAGS is specified it should be assigned to a non-type-specific variable.
To configure CMake for cross-compiling, use `--toolchain depends/${HOST}/toolchain.cmake` command-line option.
Not using the latest commit 3f8483b61a5eee3e958328d90f25f29a1a61ae7b due to chaincodelabs/libmultiprocess#97 (comment)
`WITH_BDB` default is `OFF`.
Only versioning has been updated for now.
Keep this commit at the top when rebasing.
Friendly ping @m3dwards @vasild @TheCharlatan @pablomartin4btc :) |
TheCharlatan
approved these changes
May 4, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Thank you for your review! This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging. Closing. |
This was referenced May 4, 2024
My Guix builds:
|
hebasto
added a commit
that referenced
this pull request
May 8, 2024
5aa5843 fixup! cmake: Add fuzzing options (Hennadii Stepanov) Pull request description: This PR ports bitcoin#30031 after the recent sync/rebase [PR](#186). Top commit has no ACKs. Tree-SHA512: b90c3048e22804e520b77e20ed33d8a9cd755b1b6d5e04a6f2922bba9cdd9bc675c8f70bcb13003c4933930328c3e8d2d77cce501a036edf2eca9d1d599c743a
hebasto
added a commit
that referenced
this pull request
May 8, 2024
1689b48 fixup! ci: Test CMake edge cases (Hennadii Stepanov) b72aeba fixup! ci: Test CMake edge cases (Hennadii Stepanov) f38ec56 fixup! cmake: Add compiler diagnostic flags (Hennadii Stepanov) Pull request description: This PR ports bitcoin#25972 after the recent sync/rebase [PR](#186). ACKs for top commit: vasild: ACK 1689b48 Tree-SHA512: 0cc7a6a1ad0c9e99e0dddcd69bf00ae182119b33ecc0f21d22446e207ce756b8fa7d865585dfd2fb43458c44db00194e9088f7ea01a1c7cc226f3117a20374d7
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the cmake-staging branch rebased on the recent bitcoin/master one, which includes the main build system changes, with the squashed "!fixup" commits.
Steps to reproduce:
There are a few conflicts that have to be resolved.
Squash the "cmake [FIXUP]: Move
find_program(brew)
out from introspection file" commit manually by pulling its changes into the two earlier commits: "cmake: Add wallet functionality" and "cmake: Buildbitcoin-qt
executable".Reorder the recent commits to pop up the docs and CI changes.
Port build system changes from Simplify network-adjusted time warning logic bitcoin/bitcoin#29623.