gnucash maint: Fix build of windows resources file.

John Ralls jralls at code.gnucash.org
Sat Jun 16 18:31:21 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/9b7544a7 (commit)
	from  https://github.com/Gnucash/gnucash/commit/c1103a3a (commit)



commit 9b7544a77794184c8df4ec7f0a2c998471f44f95
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 16 14:01:20 2018 -0700

    Fix build of windows resources file.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 84f764c..2ae906a 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -36,7 +36,7 @@ add_definitions (-DHAVE_CONFIG_H)
 # Some settings are platform dependent. Let's define them per platform.
 if (WIN32)
     # Windows specific settings go here:
-    set (GNUCASH_RESOURCE_FILE gnucash.rc)
+    set (GNUCASH_RESOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/gnucash.rc)
     configure_file(gnucash.rc.in gnucash.rc @ONLY NEWLINE_STYLE WIN32)
 
 else (WIN32)
diff --git a/gnucash/gnucash.rc.in b/gnucash/gnucash.rc.in
index b2e2776..c488672 100644
--- a/gnucash/gnucash.rc.in
+++ b/gnucash/gnucash.rc.in
@@ -2,9 +2,9 @@
 
 APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico"
 
-VS_VERSION VERSIONINFO
- FILEVERSION     @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
- PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
+1 VERSIONINFO
+ FILEVERSION     @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@,0,0
+ PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@,0,0
  FILEFLAGSMASK   0x3fL
  FILEFLAGS       0x0L
  FILEOS          VOS__WINDOWS32
@@ -19,7 +19,7 @@ BEGIN
       VALUE "FileDescription", "GnuCash Program File"
       VALUE "FileVersion", "@VERSION@"
       VALUE "InternalName", "gnucash"
-      VALUE "LegalCopyright", "©2017 GnuCash Development Team, Licence: GPL v2.0 or later"
+      VALUE "LegalCopyright", "©2018 GnuCash Development Team, Licence: GPL v2.0 or later"
       VALUE "OriginalFilename", "gnucash.exe"
       VALUE "ProductName", "GnuCash Free Finance Manager"
       VALUE "ProductVersion", "@VERSION@"



Summary of changes:
 gnucash/CMakeLists.txt | 2 +-
 gnucash/gnucash.rc.in  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)



More information about the gnucash-changes mailing list