# HG changeset patch # User Sebastien Jodogne # Date 1531116823 -7200 # Node ID d30d43c0f4f0c45bfcf1c5a658e72275b6fea68b # Parent a84b487ccbdc18cb5244419d2706438559514611# Parent 5a97c68a7a51da441ae94b6ab6681b2ea7aa8e80 merge diff -r 5a97c68a7a51 -r d30d43c0f4f0 Resources/CMake/MariaDBConfiguration.cmake --- 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()