SHS/cmake
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: SHS:28e7ef2205b7ccc43fb134425eb2e799e53502b8
Branches Tags
SHS:master SHS:cmake_refactor
...
compare: SHS:04dc525afa425e64b8454b6d2a32cebc87277934
Branches Tags
SHS:master SHS:cmake_refactor

1 Commits
28e7ef2205 ... 04dc525afa

Author SHA1 Message Date
peri4
04dc525afa fix corrupted CMAKE_OBJDUMP on windows host 2026-02-28 17:23:55 +03:00
1 changed files with 5 additions and 4 deletions
Expand all files Collapse all files

9
DeployMacros.cmake
View File

@@ -714,12 +714,13 @@ macro(deploy_target _T)
endif() endif()
elseif(WIN32) elseif(WIN32)
if (NOT CMAKE_OBJDUMP) set(_OBJDUMP "${CMAKE_OBJDUMP}")
find_program(CMAKE_OBJDUMP objdump) if (NOT _OBJDUMP)
find_program(_OBJDUMP objdump)
endif() endif()
set(_AGD "${_DEPLOY_DIR}/${_TV}_win_${MY_ARCH}/") set(_AGD "${_DEPLOY_DIR}/${_TV}_win_${MY_ARCH}/")
if (__win_host) if (__win_host)
string(REPLACE "/" "\\" CMAKE_OBJDUMP "${CMAKE_OBJDUMP}") string(REPLACE "/" "\\" _OBJDUMP "${_OBJDUMP}")
endif() endif()
set(_var_exe "${_DEPLOY_DIR}/$<TARGET_FILE_NAME:${_T}>") set(_var_exe "${_DEPLOY_DIR}/$<TARGET_FILE_NAME:${_T}>")
set(_var_empty) set(_var_empty)
@@ -741,7 +742,7 @@ macro(deploy_target _T)
# gather dir # gather dir
${_CMD_} ${_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}$<TARGET_FILE_NAME:${_T}>\"" ${_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}$<TARGET_FILE_NAME:${_T}>\"" ${_ADD_DEPS}
# zip # zip
COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -q -r "\"${_DESTINATION}/${_zip_name}\"" "\"${_TV}_win_${MY_ARCH}\"" COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -q -r "\"${_DESTINATION}/${_zip_name}\"" "\"${_TV}_win_${MY_ARCH}\""
COMMENT "Generating ${_zip_name}" COMMENT "Generating ${_zip_name}"