Skip to content

Commit 0aeff29

Browse files
committed
cmake: Check for makensis tool before using it
1 parent c20a5ce commit 0aeff29

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

cmake/module/Maintenance.cmake

+9-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ endfunction()
4444

4545
function(add_windows_deploy_target)
4646
if(MINGW AND TARGET bitcoin-qt AND TARGET bitcoind AND TARGET bitcoin-cli AND TARGET bitcoin-tx AND TARGET bitcoin-wallet AND TARGET bitcoin-util AND TARGET test_bitcoin)
47+
find_program(MAKENSIS_EXECUTABLE makensis)
48+
if(NOT MAKENSIS_EXECUTABLE)
49+
add_custom_target(deploy
50+
COMMAND ${CMAKE_COMMAND} -E echo "Error: NSIS not found"
51+
)
52+
return()
53+
endif()
54+
4755
# TODO: Consider replacing this code with the CPack NSIS Generator.
4856
# See https://cmake.org/cmake/help/latest/cpack_gen/nsis.html
4957
include(GenerateSetupNsi)
@@ -58,7 +66,7 @@ function(add_windows_deploy_target)
5866
COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-wallet> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-wallet>
5967
COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-util> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-util>
6068
COMMAND ${CMAKE_STRIP} $<TARGET_FILE:test_bitcoin> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:test_bitcoin>
61-
COMMAND makensis -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi
69+
COMMAND ${MAKENSIS_EXECUTABLE} -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi
6270
VERBATIM
6371
)
6472
add_custom_target(deploy DEPENDS ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.exe)

0 commit comments

Comments
 (0)