Page MenuHomePhabricator

Fix protobuf linking when building without the wallet
ClosedPublic

Authored by jasonbcox on Dec 22 2019, 17:47.

Details

Summary

This last minute modification of D4619: https://reviews.bitcoinabc.org/D4619?vs=14737&id=15017#toc broke the build without the wallet (regardless of the value for ENABLE_BIP70). Digging into my build history, I found I accidentally tested that change with -DBUILD_WITHWALLET=OFF instead of the correct -DBUILD_BITCOIN_WALLET=OFF

This patch fixes the linking such that the build works as expected when the wallet is disabled but BIP70 is still enabled.

Test Plan
cmake -GNinja -DBUILD_BITCOIN_WALLET=OFF ..
ninja check

Also run build-without-wallet on CI for sanity.

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jasonbcox edited the test plan for this revision. (Show Details)
jasonbcox edited the summary of this revision. (Show Details)
jasonbcox edited the test plan for this revision. (Show Details)
deadalnix requested changes to this revision.Dec 23 2019, 00:01
deadalnix added inline comments.
src/qt/CMakeLists.txt
126 ↗(On Diff #15071)

Is there something so terrible about that if that it cannot be used?

This revision now requires changes to proceed.Dec 23 2019, 00:01

Move target_link_libraries to already existing ENABLE_BIP70 branch.

deadalnix requested changes to this revision.Jan 3 2020, 06:10

The diff's description is misleading. The required changes were not the cause of the problem, as teh change you had to make in this very patch demonstrate.

The code is looks correct now.

This revision now requires changes to proceed.Jan 3 2020, 06:10
This revision is now accepted and ready to land.Jan 3 2020, 06:10