diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-02 10:06:51 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-02 10:06:51 +0200 |
| commit | 37f464f3a26fe084fb6f607a1d4f64ab750f3e9c (patch) | |
| tree | b4309dcfd54e2d6e966ff86629826fa5fbccece7 /win/packaging/heidisql.cmake | |
| parent | 58c6165e2809d4009aaae5b050d0a6568a7b0b29 (diff) | |
| download | mariadb-git-37f464f3a26fe084fb6f607a1d4f64ab750f3e9c.tar.gz | |
use our libmysql.dll with HeidiSQL, if we compile 32 bit
Diffstat (limited to 'win/packaging/heidisql.cmake')
| -rw-r--r-- | win/packaging/heidisql.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index e96cbf54282..94a287cba08 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -11,10 +11,12 @@ IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}) ${CMAKE_COMMAND} -E tar xfz ${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)
- CONFIGURE_FILE(${LIBMYSQL_LOCATION} ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll COPYONLY)
+ SET(LIBMYSQLDLL_SOURCE "${LIBMYSQL_LOCATION}")
ENDIF()
ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi)
|