Skip to content

Commit 7c151e7

Browse files
committed
cmake: Rename option WITH_EXTERNAL_SIGNER to ENABLE_EXTERNAL_SIGNER
1 parent 41a2159 commit 7c151e7

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ if(WITH_USDT)
141141
find_package(USDT MODULE REQUIRED)
142142
endif()
143143

144-
cmake_dependent_option(WITH_EXTERNAL_SIGNER "Enable external signer support." ON "NOT WIN32" OFF)
145-
set(ENABLE_EXTERNAL_SIGNER ${WITH_EXTERNAL_SIGNER})
144+
cmake_dependent_option(ENABLE_EXTERNAL_SIGNER "Enable external signer support." ON "NOT WIN32" OFF)
146145

147146
cmake_dependent_option(WITH_QRENCODE "Enable QR code support." ON "BUILD_GUI" OFF)
148147
if(WITH_QRENCODE)
@@ -216,7 +215,7 @@ if(ENABLE_FUZZ)
216215
set(BUILD_KERNEL_LIB OFF)
217216
set(BUILD_WALLET_TOOL OFF)
218217
set(BUILD_GUI OFF)
219-
set(WITH_EXTERNAL_SIGNER OFF)
218+
set(ENABLE_EXTERNAL_SIGNER OFF)
220219
set(WITH_NATPMP OFF)
221220
set(WITH_MINIUPNPC OFF)
222221
set(WITH_ZMQ OFF)
@@ -621,8 +620,9 @@ message(" libbitcoinkernel (experimental) ..... ${BUILD_KERNEL_LIB}")
621620
message("Wallet support:")
622621
message(" SQLite, descriptor wallets .......... ${WITH_SQLITE}")
623622
message(" Berkeley DB, legacy wallets ......... ${WITH_BDB}")
623+
message("Optional features:")
624+
message(" external signer ..................... ${ENABLE_EXTERNAL_SIGNER}")
624625
message("Optional packages:")
625-
message(" external signer ..................... ${WITH_EXTERNAL_SIGNER}")
626626
message(" NAT-PMP ............................. ${WITH_NATPMP}")
627627
message(" UPnP ................................ ${WITH_MINIUPNPC}")
628628
message(" ZeroMQ .............................. ${WITH_ZMQ}")

CMakePresets.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"rhs": "Linux"
2727
},
2828
"cacheVariables": {
29-
"WITH_EXTERNAL_SIGNER": "ON",
29+
"ENABLE_EXTERNAL_SIGNER": "ON",
3030
"WITH_USDT": "ON"
3131
}
3232
},
@@ -41,7 +41,7 @@
4141
},
4242
"cacheVariables": {
4343
"BUILD_GUI": "ON",
44-
"WITH_EXTERNAL_SIGNER": "ON"
44+
"ENABLE_EXTERNAL_SIGNER": "ON"
4545
}
4646
},
4747
{

ci/test/03_test_script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ if [ -n "$ANDROID_TOOLS_URL" ]; then
122122
exit 0
123123
fi
124124

125-
BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DWITH_EXTERNAL_SIGNER=ON -DCMAKE_INSTALL_PREFIX=$BASE_OUTDIR"
125+
BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DENABLE_EXTERNAL_SIGNER=ON -DCMAKE_INSTALL_PREFIX=$BASE_OUTDIR"
126126

127127
if [[ "${RUN_TIDY}" == "true" ]]; then
128128
BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"

test/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function(create_test_config)
2424
set_configure_variable(BUILD_DAEMON BUILD_BITCOIND)
2525
set_configure_variable(BUILD_FUZZ_BINARY ENABLE_FUZZ_BINARY)
2626
set_configure_variable(WITH_ZMQ ENABLE_ZMQ)
27-
set_configure_variable(WITH_EXTERNAL_SIGNER ENABLE_EXTERNAL_SIGNER)
27+
set_configure_variable(ENABLE_EXTERNAL_SIGNER ENABLE_EXTERNAL_SIGNER)
2828
set_configure_variable(WITH_USDT ENABLE_USDT_TRACEPOINTS)
2929

3030
configure_file(config.ini.in config.ini @ONLY)

0 commit comments

Comments
 (0)