automatic handling of version info in windows resources

ChrisHal · May 19, 2022 · 637078a · 637078a
1 parent 13adebb
commit 637078a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ QtPMbrowser/Makefile.Release
 out/
 CMakeSettings.json
 doc/conf.py
+QtPMbrowser/QtPMbrowser.rc
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(QtPMbrowser VERSION 2.1 LANGUAGES CXX)
+project(QtPMbrowser VERSION 2.1.0 LANGUAGES CXX)
 set(MY_COPYRIGHT "2020 - 2022 Christian R. Halaszovich")
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -13,8 +13,6 @@ include(GNUInstallDirs)
 include(InstallRequiredSystemLibraries)
 set(CPACK_PACKAGE_NAME "PMbrowser")
 set(CPACK_RESOURCE_FILE_LICENSE  ${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt)
-#set(CPACK_PACKAGE_VERSION_MAJOR "2")
-#set(CPACK_PACKAGE_VERSION_MINOR "0")
 set(CPACK_PACKAGE_CONTACT "[email protected]")
 set(CPACK_PACKAGE_DESCRIPTION "tool to browse HEKA dat files and export to IgorPro")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "tool to browse HEKA dat files and export to IgorPro")

diff --git a/QtPMbrowser/CMakeLists.txt b/QtPMbrowser/CMakeLists.txt
@@ -46,6 +46,7 @@ target_link_libraries(QtPMbrowser PRIVATE
 )
 
 configure_file(Config.h.in Config.h)
+configure_file(QtPMbrowser.rc.in ${CMAKE_CURRENT_SOURCE_DIR}/QtPMbrowser.rc)
 target_include_directories(QtPMbrowser PUBLIC "${PROJECT_BINARY_DIR}")
 
 if(CMAKE_BUILD_TYPE STREQUAL Release)

diff --git a/QtPMbrowser/QtPMbrowser.rc → QtPMbrowser/QtPMbrowser.rc.in b/QtPMbrowser/QtPMbrowser.rc → QtPMbrowser/QtPMbrowser.rc.in
@@ -61,8 +61,8 @@ IDI_ICON1               ICON                    "myappico.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,1
- PRODUCTVERSION 2,0,0,1
+ FILEVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,1
+ PRODUCTVERSION @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Christian R. Halaszovich, M.D."
             VALUE "FileDescription", "PMbrowser: Tool for  viewing PM files"
-            VALUE "FileVersion", "2.0.0.1"
+            VALUE "FileVersion", "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@.1"
             VALUE "InternalName", "QtPMbrow.exe"
-            VALUE "LegalCopyright", "Copyright (C) 2020 - 2022 Christian R. Halaszovich"
+            VALUE "LegalCopyright", "Copyright (C) @MY_COPYRIGHT@"
             VALUE "OriginalFilename", "QtPMbrow.exe"
             VALUE "ProductName", "PMbrowser"
-            VALUE "ProductVersion", "2.0.0.1"
+            VALUE "ProductVersion", "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@.1"
         END
     END
     BLOCK "VarFileInfo"