# HG changeset patch # User Sebastien Jodogne # Date 1531116800 -7200 # Node ID a84b487ccbdc18cb5244419d2706438559514611 # Parent 17bce6a07b2bd9fdc202b60cfaf29eebaf4bd653 fix openssl linking diff -r 17bce6a07b2b -r a84b487ccbdc Resources/CMake/DatabasesFrameworkConfiguration.cmake --- a/Resources/CMake/DatabasesFrameworkConfiguration.cmake Thu Jul 05 15:06:32 2018 +0200 +++ b/Resources/CMake/DatabasesFrameworkConfiguration.cmake Mon Jul 09 08:13:20 2018 +0200 @@ -34,6 +34,7 @@ if (ENABLE_MYSQL_BACKEND) set(ENABLE_CRYPTO_OPTIONS ON) set(ENABLE_SSL ON) + set(ENABLE_ZLIB ON) if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") set(ENABLE_LOCALE ON) # iconv is needed diff -r 17bce6a07b2b -r a84b487ccbdc Resources/CMake/MariaDBConfiguration.cmake --- a/Resources/CMake/MariaDBConfiguration.cmake Thu Jul 05 15:06:32 2018 +0200 +++ b/Resources/CMake/MariaDBConfiguration.cmake Mon Jul 09 08:13:20 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()