diff --git a/CMakeLists.txt b/CMakeLists.txt index 46e9a1dd2..27cd35814 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,8 +87,8 @@ else() endif() set(APP_NAME "RSS Guard") -set(APP_AUTHOR "") -set(APP_COPYRIGHT "") +set(APP_AUTHOR "Martin Rotter") +set(APP_COPYRIGHT "(C) 2011-2022 ${APP_AUTHOR}") set(APP_REVERSE_NAME "com.github.rssguard") set(TYPEINFO "????") diff --git a/resources/rssguard.rc.in b/resources/rssguard.rc.in index b86e28cc1..be5a92aeb 100644 --- a/resources/rssguard.rc.in +++ b/resources/rssguard.rc.in @@ -1,32 +1,41 @@ -TYPELIB "versioninfo.rc" +#include -IDI_APPLICATION ICON "@CMAKE_PROJECT_NAME@.ico" +IDI_ICON1 ICON "@CMAKE_PROJECT_NAME@.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 -PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 -FILEFLAGSMASK 0x3fL -#ifdef _DEBUG -FILEFLAGS 0x1L -#else -FILEFLAGS 0x0L -#endif -FILEOS 0x4L -FILETYPE 0x2L -FILESUBTYPE 0x0L + FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 + PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_PATCH@,0 + FILEFLAGSMASK 0x3fL + #ifdef _DEBUG + FILEFLAGS 0x1L + #else + FILEFLAGS 0x0L + #endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L + BEGIN BLOCK "StringFileInfo" + BEGIN BLOCK "040904e4" + BEGIN VALUE "CompanyName", "@APP_AUTHOR@" VALUE "FileDescription", "@APP_NAME@" - VALUE "FileVersion","@CMAKE_PROJECT_VERSION" + VALUE "FileVersion","@CMAKE_PROJECT_VERSION@" VALUE "InternalName", "@CMAKE_PROJECT_NAME@" VALUE "LegalCopyright", "@APP_COPYRIGHT@" VALUE "OriginalFilename", "@CMAKE_PROJECT_NAME@.exe" VALUE "ProductName", "@APP_NAME@" - VALUE "ProductVersion","@CMAKE_PROJECT_VERSION" + VALUE "ProductVersion","@CMAKE_PROJECT_VERSION@" END END + + BLOCK "VarFileInfo" + + BEGIN + VALUE "Translation", 0x0409, 1200 + END END diff --git a/src/rssguard/CMakeLists.txt b/src/rssguard/CMakeLists.txt index 832d1ffc5..902a321d6 100644 --- a/src/rssguard/CMakeLists.txt +++ b/src/rssguard/CMakeLists.txt @@ -1,13 +1,9 @@ -# TODO: fix RC file - -#if(WIN32) - #enable_language("RC") - #add_executable(app main.cpp ${CMAKE_BINARY_DIR}/rssguard.rc) -#else() - #add_executable(app main.cpp) -#endif() - -add_executable(app main.cpp) +if(WIN32) + enable_language("RC") + add_executable(app main.cpp ${CMAKE_BINARY_DIR}/rssguard.rc) +else() + add_executable(app main.cpp) +endif() target_compile_definitions(app PRIVATE RSSGUARD_DLLSPEC=Q_DECL_IMPORT)