Mercurial > hg > orthanc-databases
changeset 8:d30d43c0f4f0
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 09 Jul 2018 08:13:43 +0200 |
parents | a84b487ccbdc (diff) 5a97c68a7a51 (current diff) |
children | eff482803d30 |
files | |
diffstat | 1 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/MariaDBConfiguration.cmake Thu Jul 05 17:34:07 2018 +0200 +++ b/Resources/CMake/MariaDBConfiguration.cmake Mon Jul 09 08:13:43 2018 +0200 @@ -58,15 +58,6 @@ ${MARIADB_CLIENT_VERSION_MINOR} * 100 + ${MARIADB_CLIENT_VERSION_PATCH}") - add_definitions( - -DHAVE_OPENSSL=1 - -DHAVE_TLS=1 - -DHAVE_REMOTEIO=1 - -DHAVE_COMPRESS=1 - -DLIBMARIADB - -DTHREAD - ) - set(HAVE_DLOPEN 1) set(PROTOCOL_VERSION ${MARIADB_CLIENT_VERSION_MAJOR}) set(MARIADB_PORT 3306) @@ -132,6 +123,11 @@ ${MARIADB_CLIENT_SOURCES_DIR}/plugins/pvio/pvio_socket.c ) + set_property( + SOURCE ${MYSQL_CLIENT_SOURCES} + PROPERTY COMPILE_DEFINITIONS "HAVE_OPENSSL=1;HAVE_TLS=1;HAVE_REMOTEIO=1;HAVE_COMPRESS=1;LIBMARIADB;THREAD" + ) + if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") link_libraries(shlwapi) endif()