Skip to content

Commit 1f9b2e1

Browse files
committed
cmake: Require zip only for deploy target
1 parent 0aeff29 commit 1f9b2e1

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

cmake/module/Maintenance.cmake

+16-10
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,22 @@ function(add_macos_deploy_target)
119119
DEPENDS ${PROJECT_BINARY_DIR}/dist/${macos_app}/Contents/MacOS/Bitcoin-Qt
120120
)
121121

122-
find_program(ZIP_COMMAND zip REQUIRED)
123-
add_custom_command(
124-
OUTPUT ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
125-
WORKING_DIRECTORY dist
126-
COMMAND ${PROJECT_SOURCE_DIR}/cmake/script/macos_zip.sh ${ZIP_COMMAND} ${osx_volname}.zip
127-
VERBATIM
128-
)
129-
add_custom_target(deploy
130-
DEPENDS ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
131-
)
122+
find_program(ZIP_EXECUTABLE zip)
123+
if(NOT ZIP_EXECUTABLE)
124+
add_custom_target(deploy
125+
COMMAND ${CMAKE_COMMAND} -E echo "Error: ZIP not found"
126+
)
127+
else()
128+
add_custom_command(
129+
OUTPUT ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
130+
WORKING_DIRECTORY dist
131+
COMMAND ${PROJECT_SOURCE_DIR}/cmake/script/macos_zip.sh ${ZIP_EXECUTABLE} ${osx_volname}.zip
132+
VERBATIM
133+
)
134+
add_custom_target(deploy
135+
DEPENDS ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
136+
)
137+
endif()
132138
endif()
133139
add_dependencies(deploydir bitcoin-qt)
134140
add_dependencies(deploy deploydir)

doc/build-osx.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ brew install python
141141
#### Deploy Dependencies
142142

143143
You can [deploy](#3-deploy-optional) a `.zip` containing the Bitcoin Core application.
144-
It is required that you have `python` installed.
144+
It is required that you have `python` and `zip` installed.
145145

146146
## Building Bitcoin Core
147147

0 commit comments

Comments
 (0)