diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-05-04 03:51:30 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-05-04 03:51:30 +0200 |
| commit | e3ffaed1474971b656a3c77dc1d2605a5dbf02f6 (patch) | |
| tree | 4e6d26242c8dfc365c1b0ab3c79650c5b686d335 /cmake | |
| parent | d231dc8f59221166eea13a6580bbcc8c0c755855 (diff) | |
| download | mariadb-git-e3ffaed1474971b656a3c77dc1d2605a5dbf02f6.tar.gz | |
support same version upgrade for MSI
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/mysql_version.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake index 5f60cb68101..76cd7995ed1 100644 --- a/cmake/mysql_version.cmake +++ b/cmake/mysql_version.cmake @@ -126,10 +126,12 @@ ENDIF() 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 "") + IF(NOT TINY_VERSION) + SET(TINY_VERSION "0") + ENDIF() GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - + SET(FILETYPE VFT_APP) CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in ${CMAKE_BINARY_DIR}/versioninfo_exe.rc) @@ -137,7 +139,7 @@ IF(MSVC) SET(FILETYPE VFT_DLL) CONFIGURE_FILE(${MYSQL_CMAKE_SCRIPT_DIR}/versioninfo.rc.in ${CMAKE_BINARY_DIR}/versioninfo_dll.rc) - + FUNCTION(ADD_VERSION_INFO target target_type sources_var) IF("${target_type}" MATCHES "SHARED" OR "${target_type}" MATCHES "MODULE") SET(rcfile ${CMAKE_BINARY_DIR}/versioninfo_dll.rc) |