Mercurial > hg > orthanc-databases

changeset 7:a84b487ccbdc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix openssl linking
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Jul 2018 08:13:20 +0200
parents 17bce6a07b2b
children d30d43c0f4f0
files Resources/CMake/DatabasesFrameworkConfiguration.cmake Resources/CMake/MariaDBConfiguration.cmake
diffstat 2 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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()