From 2c4b87a2823ebcd5e9a17d683a312eb80bf74985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Wed, 18 Mar 2020 15:53:58 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@826 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QADDeploy.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 40bb20a..8071051 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -174,6 +174,7 @@ macro(deploy_target _T) set(_COPY_SUFFIX) set(_MKDIR "mkdir" "-p" "${_AGD}") set(_MKDIR_L "mkdir" "-p" "${_AGD}lang") + set(_MKDIR_P "mkdir" "-p" "${_DESTINATION}") if ("x${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "xWindows") set(_SEP "\\") set(_COPY "xcopy" "/y" "/r") @@ -185,11 +186,13 @@ macro(deploy_target _T) string(REPLACE "/" "\\" CMAKE_OBJDUMP "${CMAKE_OBJDUMP}") set(_MKDIR "if" "not" "exist" "\"${_AGD}\"" "mkdir" "\"${_AGD}\"") set(_MKDIR_L "if" "not" "exist" "\"${_AGD}lang\"" "mkdir" "\"${_AGD}lang\"") + set(_MKDIR_P "if" "not" "exist" "\"${_DESTINATION}\"" "mkdir" "\"${_DESTINATION}\"") endif() add_custom_target(deploy # gather dir COMMAND ${_MKDIR} COMMAND ${_MKDIR_L} + COMMAND ${_MKDIR_P} COMMAND ${_COPY} "\"${_DEPLOY_DIR}${_T}.exe\"" "\"${_AGD}\"" ${_COPY_SUFFIX} COMMAND ${_COPY} "${_DEPLOY_DIR}lang${_SEP}*" "\"${_AGD}lang${_SEP}\"" ${_COPY_SUFFIX} COMMAND deploy_tool -W "\"${CMAKE_OBJDUMP}\"" -P windows -S windows -q "\"${Qt5_ROOT}\"" -s "\"${CMAKE_PREFIX_PATH}/bin;${MINGW_BIN};${DEPLOY_ADD_LIBPATH}${_DEP_LIBPATH}\"" -o ${_AGD} -p ${_AGD} "\"${_AGD}${_T}.exe\""