From 361f5794cf6058e70435c79d8be00a6f53b8219b 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: Tue, 24 Mar 2020 15:54:35 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@905 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/cmake/QADDeploy.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qad/cmake/QADDeploy.cmake b/qad/cmake/QADDeploy.cmake index 6da280e..1571a00 100644 --- a/qad/cmake/QADDeploy.cmake +++ b/qad/cmake/QADDeploy.cmake @@ -187,6 +187,9 @@ endmacro() macro(make_rc _T _out) if (WIN32) + if ("x${${_T}_VERSION_MAJOR}" STREQUAL "x") + message(FATAL_ERROR "Version for \"${_T}\" not set, use set_version()!") + endif() set(WINDOWS_RC_FULLNAME "${${_T}_FULLNAME}") set(WINDOWS_RC_VERSION "${${_T}_VERSION}") set(WINDOWS_RC_LABEL "${${_T}_LABEL}") @@ -199,6 +202,7 @@ macro(make_rc _T _out) elseif ("x${${_T}_TYPE}" STREQUAL "xSTATIC") set(WINDOWS_RC_FILETYPE "0x7L") endif() + set(_rc_version "${${_T}_VERSION_MAJOR},${${_T}_VERSION_MINOR},${${_T}_VERSION_REVISION},${${_T}_VERSION_BUILD}") get_filename_component(WINDOWS_RC_ICON "${${_T}_ICON}" REALPATH BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(_rc_file "${CMAKE_CURRENT_BINARY_DIR}/winres.rc") file(WRITE "${_rc_file}" @@ -210,8 +214,8 @@ macro(make_rc _T _out) #pragma code_page(65001) 1 ICON \"${WINDOWS_RC_ICON}\" VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,0,0,0 -PRODUCTVERSION 1,0,0,0 +FILEVERSION ${_rc_version} +PRODUCTVERSION ${_rc_version} FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x40004L