diff --git a/DeployMacros.cmake b/DeployMacros.cmake index 2e9a128..72641f5 100644 --- a/DeployMacros.cmake +++ b/DeployMacros.cmake @@ -714,12 +714,13 @@ macro(deploy_target _T) endif() elseif(WIN32) - if (NOT CMAKE_OBJDUMP) - find_program(CMAKE_OBJDUMP objdump) + set(_OBJDUMP "${CMAKE_OBJDUMP}") + if (NOT _OBJDUMP) + find_program(_OBJDUMP objdump) endif() set(_AGD "${_DEPLOY_DIR}/${_TV}_win_${MY_ARCH}/") if (__win_host) - string(REPLACE "/" "\\" CMAKE_OBJDUMP "${CMAKE_OBJDUMP}") + string(REPLACE "/" "\\" _OBJDUMP "${_OBJDUMP}") endif() set(_var_exe "${_DEPLOY_DIR}/$") set(_var_empty) @@ -741,7 +742,7 @@ macro(deploy_target _T) # gather dir ${_CMD_} - COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${CMAKE_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt${_Qt_}_ROOT}\"" -s "\"${_search_path}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$\"" ${_ADD_DEPS} + COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -W "\"${_OBJDUMP}\"" -P windows,minimal -S windows -q "\"${Qt${_Qt_}_ROOT}\"" -s "\"${_search_path}\"" -o "${_AGD}" -p "${_AGD}" "\"${_AGD}$\"" ${_ADD_DEPS} # zip COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -q -r "\"${_DESTINATION}/${_zip_name}\"" "\"${_TV}_win_${MY_ARCH}\"" COMMENT "Generating ${_zip_name}"