Skip to content

Commit c773618

Browse files
committed
Merge bitcoin/bitcoin#30867: build: Fix ENABLE_WALLET option
0037d53 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 @ c66c683: ``` $ 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 0037d53 kevkevinpal: ACK [0037d53](bitcoin/bitcoin@0037d53) pablomartin4btc: tACK 0037d53 Tree-SHA512: 0eb14ef104f12a4205172d646c2af820e04514286b5b9a4ceb59c248ce880198dd4051d669098c46c0c0dce069bb60899d90509bbcae65cbeb958e52564fe920
2 parents 349632e + 0037d53 commit c773618

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,12 @@ if(WITH_SQLITE)
103103
find_package(SQLite3 3.7.17 REQUIRED)
104104
endif()
105105
set(USE_SQLITE ON)
106-
set(ENABLE_WALLET ON)
107106
endif()
108107
option(WITH_BDB "Enable Berkeley DB (BDB) wallet support." OFF)
109108
cmake_dependent_option(WARN_INCOMPATIBLE_BDB "Warn when using a Berkeley DB (BDB) version other than 4.8." ON "WITH_BDB" OFF)
110109
if(WITH_BDB)
111110
find_package(BerkeleyDB 4.8 MODULE REQUIRED)
112111
set(USE_BDB ON)
113-
set(ENABLE_WALLET ON)
114112
if(NOT BerkeleyDB_VERSION VERSION_EQUAL 4.8)
115113
message(WARNING "Found Berkeley DB (BDB) other than 4.8.\n"
116114
"BDB (legacy) wallets opened by this build will not be portable!"

0 commit comments

Comments
 (0)