From f40d28de342fa2b744fa78e765496c48e0bc7fb4 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: Fri, 20 Mar 2020 17:52:27 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@881 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QADDeploy.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 08b9f01..9f6ff7c 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -213,6 +213,13 @@ macro(deploy_target _T) foreach(_r ${_RES_DIRS}) set(_CMD_RES ${_CMD_RES} COMMAND cp -r "${_r}" "${_AGD}/usr/share/${${_T}_COMPANY}") endforeach() + set(_CMD_COPY) + if (_DEP_LIBS) + set(_CMD_COPY ${_CMD_COPY} COMMAND cp -f ${_DEP_LIBS} ${_AGD}/usr/lib) + endif() + if (_ICON_NAME) + set(_CMD_COPY ${_CMD_COPY} COMMAND cp -f ${_ICON_FN} ${_AGD}/usr/share/pixmaps) + endif() add_custom_target(deploy # gather deb dir COMMAND mkdir -p ${_AGD}/DEBIAN @@ -222,8 +229,7 @@ macro(deploy_target _T) COMMAND mkdir -p ${_AGD}/usr/share/pixmaps COMMAND mkdir -p ${_AGD}/usr/share/applications COMMAND cp -f ${_DEPLOY_DIR}/${_T} ${_AGD}/usr/bin - COMMAND cp -f ${_DEP_LIBS} ${_AGD}/usr/lib - COMMAND cp -f ${_ICON_FN} ${_AGD}/usr/share/pixmaps + ${_CMD_COPY} ${_CMD_RES} COMMAND echo "Package: ${_DEBNAME}" ${_C_echof}