diff options
| author | Vicentiu Ciorbaru <vicentiu@mariadb.org> | 2015-05-08 17:19:48 +0300 |
|---|---|---|
| committer | Vicentiu Ciorbaru <vicentiu@mariadb.org> | 2015-05-08 17:19:48 +0300 |
| commit | 373d092b3a52ead7cc25f5f81a8a480a45a16025 (patch) | |
| tree | 5cf89c414c53d8e01a6b757e935eb6cd113f50d2 /win/packaging/heidisql.cmake | |
| parent | 23b2b95f8046aee8461c71926a049accbfcf0dd2 (diff) | |
| download | mariadb-git-373d092b3a52ead7cc25f5f81a8a480a45a16025.tar.gz | |
Fix win/ files to be stored with LF in repository
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
Diffstat (limited to 'win/packaging/heidisql.cmake')
| -rw-r--r-- | win/packaging/heidisql.cmake | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index f9334f09570..5b0cd07cea4 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -1,23 +1,23 @@ -SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_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})
-
-IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP})
- MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR})
- MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}")
- FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60)
- EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR}
- ${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)
- 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)
+SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_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}) + +IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}) + MAKE_DIRECTORY(${HEIDISQL_DOWNLOAD_DIR}) + MESSAGE(STATUS "Downloading ${HEIDISQL_URL} to ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}") + FILE(DOWNLOAD ${HEIDISQL_URL} ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP} TIMEOUT 60) + EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir ${HEIDISQL_DOWNLOAD_DIR} + ${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) + 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) |