git-svn-id: svn://db.shs.com.ru/libs@803 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2020-03-16 12:36:57 +00:00
parent 02f61ba532
commit 471fcb9d85
2 changed files with 10 additions and 2 deletions

View File

@@ -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}")

View File

@@ -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()