From c3dd466f47b5a554f03b538aa99fd78366c5de8a 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:18:57 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@858 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QADDeploy.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 7194afd..bb8ddd4 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -159,6 +159,7 @@ macro(deploy_target _T) get_filename_component(_ICON_FN "${${_T}_ICON}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(_TV "${_T}_${${_T}_VERSION}") set(_DEP_LIBPATH) + set(_DEP_LIBS_CS) set(_DEP_LIBS) get_target_property(_LL ${_T} LINK_LIBRARIES) foreach (_L ${_LL}) @@ -169,6 +170,7 @@ macro(deploy_target _T) set(_DEP_LIBPATH "${_DEP_LIBPATH};$") get_target_property(_LT ${_L} TYPE) if ("x${_LT}" STREQUAL "xSHARED_LIBRARY") + set(_DEP_LIBS_CS "${_DEP_LIBS_CS};$/$") set(_DEP_LIBS "${_DEP_LIBS}" "$/$") endif() endif() @@ -215,7 +217,7 @@ macro(deploy_target _T) 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 deploy_tool --prefix "Depends: " --dependencies -l ${CMAKE_LDD} ${_DEPLOY_DIR}/${_T} -a "${_DEP_LIBS_CS}" ${_echo} COMMAND echo "Conflicts:" ${_echo} COMMAND echo "Replaces:" ${_echo} COMMAND echo "Section: misc" ${_echo}