From 7c151e7980451ffbcc832e4e9d151b6babb01578 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 22 May 2024 12:55:49 +0100
Subject: [PATCH] cmake: Rename option `WITH_EXTERNAL_SIGNER` to
 `ENABLE_EXTERNAL_SIGNER`

---
 CMakeLists.txt            | 8 ++++----
 CMakePresets.json         | 4 ++--
 ci/test/03_test_script.sh | 2 +-
 test/CMakeLists.txt       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 882c4420f6479..a501f4e900b3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,8 +141,7 @@ if(WITH_USDT)
   find_package(USDT MODULE REQUIRED)
 endif()
 
-cmake_dependent_option(WITH_EXTERNAL_SIGNER "Enable external signer support." ON "NOT WIN32" OFF)
-set(ENABLE_EXTERNAL_SIGNER ${WITH_EXTERNAL_SIGNER})
+cmake_dependent_option(ENABLE_EXTERNAL_SIGNER "Enable external signer support." ON "NOT WIN32" OFF)
 
 cmake_dependent_option(WITH_QRENCODE "Enable QR code support." ON "BUILD_GUI" OFF)
 if(WITH_QRENCODE)
@@ -216,7 +215,7 @@ if(ENABLE_FUZZ)
   set(BUILD_KERNEL_LIB OFF)
   set(BUILD_WALLET_TOOL OFF)
   set(BUILD_GUI OFF)
-  set(WITH_EXTERNAL_SIGNER OFF)
+  set(ENABLE_EXTERNAL_SIGNER OFF)
   set(WITH_NATPMP OFF)
   set(WITH_MINIUPNPC OFF)
   set(WITH_ZMQ OFF)
@@ -621,8 +620,9 @@ message("  libbitcoinkernel (experimental) ..... ${BUILD_KERNEL_LIB}")
 message("Wallet support:")
 message("  SQLite, descriptor wallets .......... ${WITH_SQLITE}")
 message("  Berkeley DB, legacy wallets ......... ${WITH_BDB}")
+message("Optional features:")
+message("  external signer ..................... ${ENABLE_EXTERNAL_SIGNER}")
 message("Optional packages:")
-message("  external signer ..................... ${WITH_EXTERNAL_SIGNER}")
 message("  NAT-PMP ............................. ${WITH_NATPMP}")
 message("  UPnP ................................ ${WITH_MINIUPNPC}")
 message("  ZeroMQ .............................. ${WITH_ZMQ}")
diff --git a/CMakePresets.json b/CMakePresets.json
index 479077c21639e..67e393b556776 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -26,7 +26,7 @@
         "rhs": "Linux"
       },
       "cacheVariables": {
-        "WITH_EXTERNAL_SIGNER": "ON",
+        "ENABLE_EXTERNAL_SIGNER": "ON",
         "WITH_USDT": "ON"
       }
     },
@@ -41,7 +41,7 @@
       },
       "cacheVariables": {
         "BUILD_GUI": "ON",
-        "WITH_EXTERNAL_SIGNER": "ON"
+        "ENABLE_EXTERNAL_SIGNER": "ON"
       }
     },
     {
diff --git a/ci/test/03_test_script.sh b/ci/test/03_test_script.sh
index 37b7e3b0e557d..d3420866997ae 100755
--- a/ci/test/03_test_script.sh
+++ b/ci/test/03_test_script.sh
@@ -122,7 +122,7 @@ if [ -n "$ANDROID_TOOLS_URL" ]; then
   exit 0
 fi
 
-BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DWITH_EXTERNAL_SIGNER=ON -DCMAKE_INSTALL_PREFIX=$BASE_OUTDIR"
+BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DENABLE_EXTERNAL_SIGNER=ON -DCMAKE_INSTALL_PREFIX=$BASE_OUTDIR"
 
 if [[ "${RUN_TIDY}" == "true" ]]; then
   BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 904248a715661..16d072b90e874 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -24,7 +24,7 @@ function(create_test_config)
   set_configure_variable(BUILD_DAEMON BUILD_BITCOIND)
   set_configure_variable(BUILD_FUZZ_BINARY ENABLE_FUZZ_BINARY)
   set_configure_variable(WITH_ZMQ ENABLE_ZMQ)
-  set_configure_variable(WITH_EXTERNAL_SIGNER ENABLE_EXTERNAL_SIGNER)
+  set_configure_variable(ENABLE_EXTERNAL_SIGNER ENABLE_EXTERNAL_SIGNER)
   set_configure_variable(WITH_USDT ENABLE_USDT_TRACEPOINTS)
 
   configure_file(config.ini.in config.ini @ONLY)