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

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