diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-29 19:01:42 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-29 19:01:42 +0200 |
| commit | c0577f6798f948138fadcc3195640adfd5ec4d92 (patch) | |
| tree | 5dbb8f375dbb1ec5e3f38aad55fc5242add275a9 /win | |
| parent | 0741f1a902fce75eeefd201b75405b7034d97ea0 (diff) | |
| download | mariadb-git-c0577f6798f948138fadcc3195640adfd5ec4d92.tar.gz | |
Add optional CMake parameter TINY_VERSION.
Parameter setting has the effect on 4th part of the version string in executable's version info on Windows.
It could be set e.g to bzr revno to uniquely identify different builds for the same major.minor.patch combo.
Diffstat (limited to 'win')
| -rw-r--r-- | win/cmake/mysql_version.cmake | 4 | ||||
| -rw-r--r-- | win/cmake/versioninfo.rc.in | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/win/cmake/mysql_version.cmake b/win/cmake/mysql_version.cmake index 728ee409257..79e6a18ee1d 100644 --- a/win/cmake/mysql_version.cmake +++ b/win/cmake/mysql_version.cmake @@ -116,6 +116,10 @@ ENDIF() # Refer to http://msdn.microsoft.com/en-us/library/aa381058(VS.85).aspx # for more info. IF(MSVC) + # Tiny version is used to identify the build, it can be set with cmake -DTINY_VERSION=<number> + # to bzr revno for example (in the CI builds) + SET(TINY_VERSION "0" CACHE INTERNAL "") + GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) SET(FILETYPE VFT_APP) diff --git a/win/cmake/versioninfo.rc.in b/win/cmake/versioninfo.rc.in index 97c45ec86c0..b570eb2f8e0 100644 --- a/win/cmake/versioninfo.rc.in +++ b/win/cmake/versioninfo.rc.in @@ -1,7 +1,7 @@ #include <windows.h>
VS_VERSION_INFO VERSIONINFO
-FILEVERSION @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH@,0
-PRODUCTVERSION @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH@,0
+FILEVERSION @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH@,@TINY_VERSION@
+PRODUCTVERSION @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH@,@TINY_VERSION@
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -12,8 +12,8 @@ BEGIN BEGIN
BLOCK "040904E4"
BEGIN
- VALUE "FileVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@.0\0"
- VALUE "ProductVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@.0\0"
+ VALUE "FileVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@.@TINY_VERSION@\0"
+ VALUE "ProductVersion", "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@.@TINY_VERSION@\0"
END
END
BLOCK "VarFileInfo"
|