From a32b411ef842b6a64601a59d43396d65de601226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Tue, 24 Mar 2020 09:08:07 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@889
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/cmake/QADDeploy.cmake | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/qad/cmake/QADDeploy.cmake b/qad/cmake/QADDeploy.cmake
index 9634195..c28ee1a 100644
--- a/qad/cmake/QADDeploy.cmake
+++ b/qad/cmake/QADDeploy.cmake
@@ -1,7 +1,7 @@
 if (POLICY CMP0057)
 	cmake_policy(SET CMP0057 NEW) # Support if() IN_LIST
 endif()
-set(__prop_names "LABEL;VERSION;FULLNAME;COMPANY;ICON;INFO")
+set(__prop_names "LABEL;APPVERSION;FULLNAME;COMPANY;ICON;INFO")
 include(TargetArch)
 if (NOT MY_ARCH)
 	target_architecture(MY_ARCH)
@@ -12,7 +12,7 @@ endif()
 #
 # Set target deploy property, where NAME one of:
 #  * LABEL - application icon name
-#  * VERSION - version
+#  * APPVERSION - version
 #  * FULLNAME - package name in format "*.*.*"
 #  * COMPANY - company name
 #  * ICON - icon file
@@ -50,7 +50,7 @@ endmacro()
 macro(make_rc _T _out)
 	if (WIN32)
 		set(WINDOWS_RC_FULLNAME	"${${_T}_FULLNAME}")
-		set(WINDOWS_RC_VERSION	"${${_T}_VERSION}")
+		set(WINDOWS_RC_VERSION	"${${_T}_APPVERSION}")
 		set(WINDOWS_RC_LABEL	"${${_T}_LABEL}")
 		set(WINDOWS_RC_COMPANY	"${${_T}_COMPANY}")
 		set(WINDOWS_RC_INFO		"${${_T}_INFO}")
@@ -162,7 +162,7 @@ macro(deploy_target _T)
 	endforeach()
 	get_filename_component(_ICON_NAME "${${_T}_ICON}" NAME)
 	get_filename_component(_ICON_FN "${${_T}_ICON}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-	set(_TV "${_T}_${${_T}_VERSION}")
+	set(_TV "${_T}_${${_T}_APPVERSION}")
 	set(_DEP_LIBPATH)
 	set(_DEP_LIBS_CS)
 	set(_DEP_LIBS)
@@ -233,7 +233,7 @@ macro(deploy_target _T)
 			${_CMD_RES}
 
 			COMMAND echo "Package: ${_DEBNAME}" ${_C_echof}
-			COMMAND echo "Version: ${${_T}_VERSION}" ${_C_echo}
+			COMMAND echo "Version: ${${_T}_APPVERSION}" ${_C_echo}
 			COMMAND echo "Architecture: ${_DEB_ARCH}" ${_C_echo}
 			COMMAND echo "Maintainer: ${${_T}_COMPANY} <>" ${_C_echo}
 			COMMAND deploy_tool --prefix "Depends: " --dependencies -l ${CMAKE_LDD} ${_DEPLOY_DIR}/${_T} -a "${_DEP_LIBS_CS}" -o "${_AGD}/usr/lib" ${_C_echo}
@@ -312,8 +312,8 @@ macro(deploy_target _T)
 			)
 	elseif (APPLE)
 		set(MACOSX_BUNDLE_GUI_IDENTIFIER	   "${${_T}_FULLNAME}")
-		set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${${_T}_VERSION}")
-		set(MACOSX_BUNDLE_LONG_VERSION_STRING  "${${_T}_VERSION}")
+		set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${${_T}_APPVERSION}")
+		set(MACOSX_BUNDLE_LONG_VERSION_STRING  "${${_T}_APPVERSION}")
 		set(MACOSX_BUNDLE_ICON_FILE			   "${_ICON_NAME}")
 		set(MACOSX_BUNDLE_BUNDLE_NAME		   "${${_T}_LABEL}")
 		set(MACOSX_BUNDLE_COPYRIGHT			   "${${_T}_COMPANY}")