# HG changeset patch # User Sebastien Jodogne # Date 1547128311 -3600 # Node ID ff2d56d37bfd8c2eb7a32e3683f6a6a783765bd6 # Parent 515a783630dfb4654014994a3d35b606e117b85a fix windows build diff -r 515a783630df -r ff2d56d37bfd Resources/CMake/DatabasesFrameworkConfiguration.cmake --- 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) diff -r 515a783630df -r ff2d56d37bfd Resources/CMake/PostgreSQLConfiguration.cmake --- 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)