From f85e740494a4ef9f34bf41d21d67f0e38d242fe3 Mon Sep 17 00:00:00 2001 From: Stanislav Ershov Date: Sat, 27 Oct 2018 09:03:05 +0300 Subject: [PATCH] Rename Telegram.rc -> Kepka.rc.in Configure Kepka.rc.in -> Kepka.rc --- Telegram/CMakeLists.txt | 3 ++- .../Resources/winrc/{Telegram.rc => Kepka.rc.in} | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) rename Telegram/Resources/winrc/{Telegram.rc => Kepka.rc.in} (74%) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 00e700d36..c0b8c924b 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -482,6 +482,7 @@ if (APPLE) endif() if (WIN32) + configure_file(Resources/winrc/Kepka.rc.in Resources/winrc/Kepka.rc) target_sources(Kepka PRIVATE SourceFiles/platform/win/audio_win.cpp SourceFiles/platform/win/file_utilities_win.cpp @@ -493,7 +494,7 @@ if (WIN32) SourceFiles/platform/win/windows_dlls.cpp SourceFiles/platform/win/windows_event_filter.cpp - Resources/winrc/Telegram.rc + ${CMAKE_CURRENT_BINARY_DIR}/Resources/winrc/Kepka.rc ) set(tg_RESOURCES Resources/qrc/telegram_wnd.qrc) endif() diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Kepka.rc.in similarity index 74% rename from Telegram/Resources/winrc/Telegram.rc rename to Telegram/Resources/winrc/Kepka.rc.in index 385c6336f..66afe77b6 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Kepka.rc.in @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "@CMAKE_CURRENT_SOURCE_DIR@/Resources/winrc/resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -26,7 +26,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON1 ICON "..\\art\\icon256.ico" +IDI_ICON1 ICON "@CMAKE_CURRENT_SOURCE_DIR@/Resources/art/icon256.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,23,0 - PRODUCTVERSION 1,1,23,0 + FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_RC@ + PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,@PROJECT_VERSION_RC@ FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,11 +51,11 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.1.23.0" + VALUE "FileDescription", "@PROJECT_NAME@" + VALUE "FileVersion", "@PROJECT_VERSION@" VALUE "LegalCopyright", "Copyright (C) 2014-2017" - VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.23.0" + VALUE "ProductName", "@PROJECT_NAME@" + VALUE "ProductVersion", "@PROJECT_VERSION@" END END BLOCK "VarFileInfo"