From 2aad4053ba68f58c75adbdf2d80a530295bf602d 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:03:31 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@854 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QADDeploy.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 7b2ceb1..a407e8a 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -215,13 +215,13 @@ macro(deploy_target _T) COMMAND echo \"Version: ${${_T}_VERSION}\" ${_echo} COMMAND echo \"Architecture: ${_DEB_ARCH}\" ${_echo} COMMAND echo \"Maintainer: ${${_T}_COMPANY} <>\" ${_echo} - COMMAND echo \"Depends: openjdk-8-jre, icedtea-netx-common (>= 1.6.2-3.1+deb9u1)\" ${_echo} + COMMAND echo \"Depends: \$(deploy_tool --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 deploy_tool -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} + #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} COMMENT "Generating ${_TV}.deb"