Unify version patch number management in cmake

This commit is contained in:
Adrian Insaurralde Avalos
2022-12-04 18:57:43 -03:00
committed by Uwe
parent 75dc8f9410
commit 95fcf171b8
5 changed files with 10 additions and 10 deletions

View File

@@ -3,6 +3,7 @@
#define FCVersionMajor "${PACKAGE_VERSION_MAJOR}"
#define FCVersionMinor "${PACKAGE_VERSION_MINOR}"
#define FCVersionName "${PACKAGE_VERSION_NAME}"
#define FCVersionPoint "${PACKAGE_VERSION_PATCH}"
// test: $Format:Hash (%H), Date: %ci$
#define FCRevision "${PACKAGE_WCREF}" //Highest committed revision number
#define FCRevisionDate "${PACKAGE_WCDATE}" //Date of highest committed revision

View File

@@ -13,7 +13,7 @@ IDI_ICON1 ICON DISCARDABLE "icon.ico"
// File info for the FreeCAD.exe
//
1 VERSIONINFO
FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${FREECAD_VERSION_PATCH},${PACKAGE_VERSION_PATCH}
FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${PACKAGE_VERSION_PATCH},${PACKAGE_BUILD_VERSION}
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -25,7 +25,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "FreeCAD.exe"
VALUE "ProductName", "${PROJECT_NAME}"
VALUE "ProductVersion", "${FREECAD_VERSION}.${FREECAD_VERSION_PATCH}${PACKAGE_VERSION_SUFFIX}"
VALUE "ProductVersion", "${PACKAGE_VERSION}${PACKAGE_VERSION_SUFFIX}"
END
END
BLOCK "VarFileInfo"

View File

@@ -13,7 +13,7 @@ IDI_ICON1 ICON DISCARDABLE "icon.ico"
// File info for the FreeCADCmd.exe
//
1 VERSIONINFO
FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${FREECAD_VERSION_PATCH},${PACKAGE_VERSION_PATCH}
FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${PACKAGE_VERSION_PATCH},${PACKAGE_BUILD_VERSION}
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -25,7 +25,7 @@ BEGIN
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "FreeCADCmd.exe"
VALUE "ProductName", "${PROJECT_NAME}"
VALUE "ProductVersion", "${FREECAD_VERSION}.${FREECAD_VERSION_PATCH}${PACKAGE_VERSION_SUFFIX}"
VALUE "ProductVersion", "${PACKAGE_VERSION}${PACKAGE_VERSION_SUFFIX}"
END
END
BLOCK "VarFileInfo"