diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-07-05 15:14:52 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-07-05 15:15:26 +0200 |
| commit | 399d012c81b8f830a19ccf03d156cdd6194380c3 (patch) | |
| tree | 542cab5f8ad4f1050ed366f27f7129862d90171b /win/packaging/heidisql.cmake | |
| parent | ecd8f44844c84b7ab0865eeb4e6e0ddd15836e16 (diff) | |
| download | mariadb-git-399d012c81b8f830a19ccf03d156cdd6194380c3.tar.gz | |
MDEV-19922 Old version of heidisql in mariadb installer
Upgrade HeidiSQL to 10.2
Diffstat (limited to 'win/packaging/heidisql.cmake')
| -rw-r--r-- | win/packaging/heidisql.cmake | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index 29ecdd8eb4f..1b9fb3d110c 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -1,4 +1,4 @@ -SET(HEIDISQL_BASE_NAME "HeidiSQL_9.5_Portable") +SET(HEIDISQL_BASE_NAME "HeidiSQL_10.2_32_Portable") SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip") SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}") SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME}) @@ -12,12 +12,5 @@ IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}) ) ENDIF() -SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll) -IF(CMAKE_SIZEOF_VOID_P EQUAL 4) - # Use our libmysql if it is 32 bit. - IF(LIBMYSQL_LOCATION) - SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}") - ENDIF() -ENDIF() CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi) |