From 983512b435f76cdc88397ac25f449abf939c4ebf 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?= <peri4ko@yandex.ru>
Date: Wed, 18 Mar 2020 19:32:50 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@833
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/QADDeploy.cmake | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake
index ff67176..475757b 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)
 	get_target_property(_LL ${_T} LINK_LIBRARIES)
 	foreach (_L ${_LL})
 		if (TARGET ${_L})
@@ -166,6 +167,7 @@ macro(deploy_target _T)
 			if (NOT _II)
 				#message("depend on ${_L}")
 				set(_DEP_LIBPATH "${_DEP_LIBPATH}\;$<TARGET_FILE_DIR:${_L}>")
+				set(_DEP_LIBS "${_DEP_LIBS}\ $<TARGET_FILE_DIR:${_L}>/$<TARGET_FILE_NAME:${_L}>")
 			endif()
 		endif()
 	endforeach()
@@ -181,12 +183,16 @@ macro(deploy_target _T)
 			COMMAND mkdir -p ${_AGD}/DEBIAN
 			COMMAND mkdir -p ${_AGD}/usr/bin
 			COMMAND mkdir -p ${_AGD}/usr/lib
-			COMMAND mkdir -p ${_DESTINATION}
-			COMMAND cp ${_ICON_FN} ${_AGD}/Contents/Resources
-			COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/Contents/MacOS
-			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 mkdir -p ${_AGD}/usr/share/SHS
+			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 -r ${_DEPLOY_DIR}/lang ${_AGD}/usr/share/SHS
+			COMMAND cp -f ${_ICON_FN} ${_AGD}/usr/share/pixmaps
+			#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}
 			# generate deb
-			COMMAND genisoimage -quiet -V ${_T} -D -R -apple -no-pad -o ${_DESTINATION}/${_TV}.dmg ${_DMG}
+			#COMMAND genisoimage -quiet -V ${_T} -D -R -apple -no-pad -o ${_DESTINATION}/${_TV}.dmg ${_DMG}
 			COMMENT "Generating ${_TV}.deb"
 			)
 	elseif(WIN32)