From 402db6389e69535df5842788ccd9e8626602f340 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 16:00:20 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@906 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 1571a00..116bc04 100644 --- a/qad/cmake/QADDeploy.cmake +++ b/qad/cmake/QADDeploy.cmake @@ -203,7 +203,11 @@ macro(make_rc _T _out) 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(_icon) + if (NOT ("x${${_T}_ICON}" STREQUAL "x")) + get_filename_component(WINDOWS_RC_ICON "${${_T}_ICON}" REALPATH BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + set(_icon "1 ICON \"${WINDOWS_RC_ICON}\"") + endif() set(_rc_file "${CMAKE_CURRENT_BINARY_DIR}/winres.rc") file(WRITE "${_rc_file}" "# if defined(UNDER_CE) @@ -212,7 +216,7 @@ macro(make_rc _T _out) # include # endif #pragma code_page(65001) -1 ICON \"${WINDOWS_RC_ICON}\" +${_icon} VS_VERSION_INFO VERSIONINFO FILEVERSION ${_rc_version} PRODUCTVERSION ${_rc_version}