cmake: Regular rebasing of the cmake-staging branch#112
Closed
hebasto wants to merge 61 commits into
Closed
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.
Owner
Author
|
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 |
Owner
Author
|
Thank you for your review! This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging. Closing. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 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
HEADand 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.