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
#112
Conversation
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>
To configure CMake for cross-compiling, use `--toolchain depends/${HOST}/share/toolchain.cmake` command-line option.
This reverts commit 1155978.
Our `QT_STATICPLUGIN` macro is effectively equivalent to the Qt's `QT_STATIC` macro. No need to handle both of them.
When using CMake, each plugin comes with a C++ stub file that automatically initializes the static plugin. Consequently, any target that links against a plugin has this C++ file added to its SOURCES, which makes the removed code redundant.
Only versioning has been updated for now.
Keep this commit at the top when rebasing.
Friendly ping @TheCharlatan @m3dwards @pablomartin4btc @vasild :) |
During rebase I had to select the incoming commit apart from the last conflict in With this rebase and step 4, I show no changes with the |
Thank you for your review! This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging. Closing. |
This is the cmake-staging branch rebased on the recent bitcoin/master one with the squashed "!fixup" and "FIXUP:" commits.
The goal is to incorporate changes from the following PRs:
Steps to reproduce:
There are a few conflicts that have to be resolved.
At this point the diff between
HEAD
and this PR branch must coincides with changes in the following item 4.Manually move changes from "FIXUP:" commits to the appropriate previous ones.
Reorder the recent commits to pop up the CI one.
Backport changes from build: bump version to 27.99 bitcoin/bitcoin#29579.