From 72024420ccaab2d9e4219a14a62e9d64eb5a3027 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: Mon, 16 Mar 2020 13:13:56 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@806 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QADDeploy.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 13d757e..5a1cb71 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -28,8 +28,8 @@ # library search path # macro(deploy_target _T full_app_name version icon label copyright info) - set(_DESTINATION) - set(_DEPLOY_DIR) + set(_DESTINATION "${CMAKE_INSTALL_PREFIX}") + set(_DEPLOY_DIR "${CMAKE_INSTALL_PREFIX}") set(_is_dest 0) set(_is_deploy_dir 0) foreach(_i ${ARGN}) @@ -77,7 +77,7 @@ macro(deploy_target _T full_app_name version icon label copyright info) set(MACOSX_BUNDLE_INFO_STRING "${info}") set(MACOSX_BUNDLE_BUNDLE_VERSION "6.0") set_target_properties(${_T} PROPERTIES MACOSX_BUNDLE TRUE) - set(_AGD "${_DEPLOY_DIR}${_T}.app") + set(_AGD "${_DEPLOY_DIR}/${_T}.app") set(_DMG "${CMAKE_CURRENT_BINARY_DIR}/dmg") add_custom_target(deploy # gather .app dir @@ -91,7 +91,7 @@ macro(deploy_target _T full_app_name version icon label copyright info) COMMAND cp -r ${_AGD} ${_DMG} COMMAND ln --symbolic /Applications ${_DMG} # generate dmg - 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}.dmg" ) endif()