diff options
| author | merge-script <fanquake@gmail.com> | 2024-09-12 09:28:20 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-09-12 09:28:20 +0100 |
| commit | c77361888695aa7e7713a9c7f63861f050834e91 (patch) | |
| tree | 2661620fe70627fa3edb9378b0beaeabac462782 | |
| parent | 349632e022da22a457a85650360b5be41fa500dc (diff) | |
| parent | 0037d53d1a21ec8a5a97a83ab716d68030446021 (diff) | |
| download | bitcoin-c77361888695aa7e7713a9c7f63861f050834e91.tar.xz | |
Merge bitcoin/bitcoin#30867: build: Fix `ENABLE_WALLET` option
0037d53d1a21ec8a5a97a83ab716d68030446021 build: Fix `ENABLE_WALLET` option (Hennadii Stepanov)
Pull request description:
The removed commands were left over from the transition from autodetection to explicit options in the CMake staging branch. These commands prevented the `-DENABLE_WALLET=OFF` option from being work properly when building with depends.
How to test:
```
$ make -C depends NO_QT=1
```
On the master branch @ c66c68345efb0bb3d5613ebac703cde779fa0f01:
```
$ rm -rf build && cmake -B build --toolchain depends/x86_64-pc-linux-gnu/toolchain.cmake -DENABLE_WALLET=OFF
< snip >
Optional features:
wallet support ...................... ON
- descriptor wallets (SQLite) ...... ON
- legacy wallets (Berkeley DB) ..... ON
external signer ..................... ON
< snip >
```
With this PR:
```
$ rm -rf build && cmake -B build --toolchain depends/x86_64-pc-linux-gnu/toolchain.cmake -DENABLE_WALLET=OFF
< snip >
Optional features:
wallet support ...................... OFF
external signer ..................... ON
< snip >
ACKs for top commit:
maflcko:
review ACK 0037d53d1a21ec8a5a97a83ab716d68030446021
kevkevinpal:
ACK [0037d53](https://github.com/bitcoin/bitcoin/pull/30867/commits/0037d53d1a21ec8a5a97a83ab716d68030446021)
pablomartin4btc:
tACK 0037d53d1a21ec8a5a97a83ab716d68030446021
Tree-SHA512: 0eb14ef104f12a4205172d646c2af820e04514286b5b9a4ceb59c248ce880198dd4051d669098c46c0c0dce069bb60899d90509bbcae65cbeb958e52564fe920
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a01b9f0d51..1524c43725 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,14 +103,12 @@ if(WITH_SQLITE) find_package(SQLite3 3.7.17 REQUIRED) endif() set(USE_SQLITE ON) - set(ENABLE_WALLET ON) endif() option(WITH_BDB "Enable Berkeley DB (BDB) wallet support." OFF) cmake_dependent_option(WARN_INCOMPATIBLE_BDB "Warn when using a Berkeley DB (BDB) version other than 4.8." ON "WITH_BDB" OFF) if(WITH_BDB) find_package(BerkeleyDB 4.8 MODULE REQUIRED) set(USE_BDB ON) - set(ENABLE_WALLET ON) if(NOT BerkeleyDB_VERSION VERSION_EQUAL 4.8) message(WARNING "Found Berkeley DB (BDB) other than 4.8.\n" "BDB (legacy) wallets opened by this build will not be portable!" |