Mercurial > hg > orthanc-databases

changeset 83:ff2d56d37bfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix windows build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 10 Jan 2019 14:51:51 +0100
parents 515a783630df
children b96446b8718b
files Resources/CMake/DatabasesFrameworkConfiguration.cmake Resources/CMake/PostgreSQLConfiguration.cmake
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/DatabasesFrameworkConfiguration.cmake	Thu Jan 10 13:32:34 2019 +0100
+++ b/Resources/CMake/DatabasesFrameworkConfiguration.cmake	Thu Jan 10 14:51:51 2019 +0100
@@ -30,6 +30,10 @@
   set(ENABLE_CRYPTO_OPTIONS ON)
   set(ENABLE_SSL ON)
   set(ENABLE_ZLIB ON)
+
+  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+    set(ENABLE_OPENSSL_ENGINES ON)
+  endif()
 endif()
 
 if (ENABLE_MYSQL_BACKEND)
--- a/Resources/CMake/PostgreSQLConfiguration.cmake	Thu Jan 10 13:32:34 2019 +0100
+++ b/Resources/CMake/PostgreSQLConfiguration.cmake	Thu Jan 10 14:51:51 2019 +0100
@@ -123,6 +123,13 @@
         )
     endif()
     
+    if (ENABLE_SSL)
+      add_definitions(
+        -DHAVE_LIBSSL=1
+        -DUSE_OPENSSL=1
+        )
+    endif()
+
   elseif(CROSS_COMPILING)
     message(FATAL_ERROR "Cannot auto-generate the configuration file cross-compiling")
     
@@ -229,7 +236,6 @@
       check_include_files("sys/socket.h;netinet/tcp.h" HAVE_NETINET_TCP_H)
     endif()
 
-
     if (ENABLE_SSL)
       set(HAVE_LIBSSL 1)
       set(HAVE_SSL_GET_CURRENT_COMPRESSION 1)