From 2d82a4c1951325b71bfa7650df357e36d08eb589 Mon Sep 17 00:00:00 2001 From: LAGonauta Date: Fri, 17 Jun 2022 18:37:34 -0300 Subject: [PATCH] Removed version from Dino executable We need a better way to get the version number --- main/CMakeLists.txt | 8 +------- main/dino-info.rc | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 1670fb04..a34ca1c9 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -212,13 +212,7 @@ OPTIONS ${MAIN_EXTRA_OPTIONS} ) -if (PROJECT_VERSION MATCHES "([0-9]+)[.]([0-9]+)[.]([0-9]+)") - set(DINO_NUMERIC_VERSION "${CMAKE_MATCH_1},${CMAKE_MATCH_2},${CMAKE_MATCH_3},0") -else() - set(DINO_NUMERIC_VERSION "0,0,0,0") -endif () - -add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\" -DDINO_NUMERIC_VERSION=${DINO_NUMERIC_VERSION}) +add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\") if(WIN32) add_link_options("-Wl,--export-all-symbols") set(CMAKE_RC_COMPILE_OBJECT " --use-temp-file -O coff -i -o ") diff --git a/main/dino-info.rc b/main/dino-info.rc index eedec5a0..d8558fc5 100644 --- a/main/dino-info.rc +++ b/main/dino-info.rc @@ -1,6 +1,4 @@ 1 VERSIONINFO -FILEVERSION DINO_NUMERIC_VERSION -PRODUCTVERSION DINO_NUMERIC_VERSION BEGIN BLOCK "StringFileInfo" BEGIN @@ -8,12 +6,10 @@ BEGIN BEGIN VALUE "CompanyName", "Dino" VALUE "FileDescription", "Dino - Modern XMPP (""Jabber"") Chat Client" - VALUE "FileVersion", DINO_VERSION VALUE "InternalName", "dino" VALUE "LegalCopyright", "Dino" VALUE "OriginalFilename", "dino.exe" VALUE "ProductName", "Dino" - VALUE "ProductVersion", DINO_VERSION END END BLOCK "VarFileInfo"