From 08995b9c5df4ce8b6775b685dee3cf5d34e81384 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 21:15:30 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@857 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QADDeploy.cmake | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index dc9c624..7194afd 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -211,19 +211,20 @@ macro(deploy_target _T) COMMAND cp -f ${_DEP_LIBS} ${_AGD}/usr/lib COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/usr/share/SHS COMMAND cp -f ${_ICON_FN} ${_AGD}/usr/share/pixmaps - COMMAND echo \"Package: ${_T}\" ${_echof} - COMMAND echo \"Version: ${${_T}_VERSION}\" ${_echo} - COMMAND echo \"Architecture: ${_DEB_ARCH}\" ${_echo} - COMMAND echo \"Maintainer: ${${_T}_COMPANY} <>\" ${_echo} - COMMAND deploy_tool --prefix \"Depends: \" --dependencies -l ${CMAKE_LDD} ${_DEPLOY_DIR}/${_T} ${_echo} - COMMAND echo \"Conflicts:\" ${_echo} - COMMAND echo \"Replaces:\" ${_echo} - COMMAND echo \"Section: misc\" ${_echo} - COMMAND echo \"Priority: optional\" ${_echo} - COMMAND echo \"Description: ${${_T}_INFO}\" ${_echo} + COMMAND echo "Package: ${_T}" ${_echof} + COMMAND echo "Version: ${${_T}_VERSION}" ${_echo} + COMMAND echo "Architecture: ${_DEB_ARCH}" ${_echo} + COMMAND echo "Maintainer: ${${_T}_COMPANY} <>" ${_echo} + COMMAND deploy_tool --prefix "Depends: " --dependencies -l ${CMAKE_LDD} ${_DEPLOY_DIR}/${_T} ${_echo} + COMMAND echo "Conflicts:" ${_echo} + COMMAND echo "Replaces:" ${_echo} + COMMAND echo "Section: misc" ${_echo} + COMMAND echo "Priority: optional" ${_echo} + COMMAND echo "Description: ${${_T}_INFO}" ${_echo} #COMMAND -l "${CMAKE_LDD}" -P xcb -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib;${DEPLOY_ADD_LIBPATH}${_DEP_LIBPATH}\"" -o ${_AGD}/usr/lib -p ${_AGD}/usr/ ${_AGD}/Contents/MacOS/${_T} # generate deb #COMMAND genisoimage -quiet -V ${_T} -D -R -apple -no-pad -o ${_DESTINATION}/${_TV}.dmg ${_DMG} + VERBATIM COMMENT "Generating ${_TV}.deb" ) elseif(WIN32)