cmake: Rename option WITH_EXTERNAL_SIGNER to ENABLE_EXTERNAL_SIGNER

hebasto · May 21, 2024 · f5f5492 · f5f5492
1 parent 3b598a0
commit f5f5492
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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/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)