From 471fcb9d85fe4c2b9b92332143cb9e2112cad0e0 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 12:36:57 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@803 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QADDeploy.cmake | 2 +- qad/QtWraps.cmake | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index ee6663b..be8bdff 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -24,7 +24,7 @@ macro(deploy_target _T full_app_name version icon label copyright info) endif() endif() endforeach() - message("app depend libpath ${_DEP_LIBPATH}") + #message("app depend libpath ${_DEP_LIBPATH}") if (APPLE) set(MACOSX_BUNDLE_GUI_IDENTIFIER "${full_app_name}") set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${version}") diff --git a/qad/QtWraps.cmake b/qad/QtWraps.cmake index a529df1..b4ed770 100644 --- a/qad/QtWraps.cmake +++ b/qad/QtWraps.cmake @@ -484,6 +484,7 @@ endmacro() # to corresponding Qt translation directory # if DESTINATION starts with "QtPlugins" files will be installed # to corresponding Qt plugins directory +# add LANG type for first argument macro(qt_install) set(_prev_inst) #message("command: ${ARGN}") @@ -541,7 +542,7 @@ macro(qt_install) endif() endif() else() - set(_INST_LIST ${_INST_LIST} ${_i}) + set(_ii ${_i}) if ("x${_i}" STREQUAL "xTARGETS") set(_IS_TARGET 1) else() @@ -550,9 +551,16 @@ macro(qt_install) else() if ("x${_i}" STREQUAL "xDESTINATION") set(_IS_DEST 1) + else() + if ("x${_i}" STREQUAL "xLANG") + set(_IS_FILES 1) + set(_IS_LANG 1) + set(_ii "FILES") + endif() endif() endif() endif() + set(_INST_LIST ${_INST_LIST} ${_ii}) endif() endif() endif()