From a14723660d0100024d54e255aed9a31a9d7baea1 Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Fri, 10 Jan 2025 13:36:03 +0100 Subject: [PATCH] tmp: install on windows --- cmake/module/GenerateSetupNsi.cmake | 1 + cmake/module/Maintenance.cmake | 2 +- share/setup.nsi.in | 1 + src/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/module/GenerateSetupNsi.cmake b/cmake/module/GenerateSetupNsi.cmake index 97a53b071dbb87..c8d5bd67c5f1e2 100644 --- a/cmake/module/GenerateSetupNsi.cmake +++ b/cmake/module/GenerateSetupNsi.cmake @@ -7,6 +7,7 @@ function(generate_setup_nsi) set(abs_top_builddir ${PROJECT_BINARY_DIR}) set(CLIENT_URL ${PROJECT_HOMEPAGE_URL}) set(CLIENT_TARNAME "bitcoin") + set(BITCOIN_WRAPPER_NAME "bitcoin") set(BITCOIN_GUI_NAME "bitcoin-qt") set(BITCOIN_DAEMON_NAME "bitcoind") set(BITCOIN_CLI_NAME "bitcoin-cli") diff --git a/cmake/module/Maintenance.cmake b/cmake/module/Maintenance.cmake index 61251d24397b31..7426e92c668562 100644 --- a/cmake/module/Maintenance.cmake +++ b/cmake/module/Maintenance.cmake @@ -42,7 +42,7 @@ function(add_maintenance_targets) VERBATIM ) - foreach(target IN ITEMS bitcoind bitcoin-qt bitcoin-cli bitcoin-tx bitcoin-util bitcoin-wallet test_bitcoin bench_bitcoin) + foreach(target IN ITEMS bitcoin bitcoind bitcoin-qt bitcoin-cli bitcoin-tx bitcoin-util bitcoin-wallet test_bitcoin bench_bitcoin) if(TARGET ${target}) list(APPEND executables $) endif() diff --git a/share/setup.nsi.in b/share/setup.nsi.in index d1a85cdb7f3506..5dc78353fd4ac8 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -79,6 +79,7 @@ Section -Main SEC0000 SetOutPath $INSTDIR\share\rpcauth File @abs_top_srcdir@/share/rpcauth/*.* SetOutPath $INSTDIR\daemon + File @abs_top_builddir@/release/@BITCOIN_WRAPPER_NAME@@EXEEXT@ File @abs_top_builddir@/release/@BITCOIN_DAEMON_NAME@@EXEEXT@ File @abs_top_builddir@/release/@BITCOIN_CLI_NAME@@EXEEXT@ File @abs_top_builddir@/release/@BITCOIN_TX_NAME@@EXEEXT@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e5ec5ebf1b79a8..f8e73799de1b63 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -309,6 +309,7 @@ target_link_libraries(bitcoin_node if(BUILD_BITCOIN_BIN) add_executable(bitcoin bitcoin.cpp) target_link_libraries(bitcoin core_interface bitcoin_util) + list(APPEND installable_targets bitcoin) endif() # Bitcoin Core bitcoind.