MonetDB: monetdburl - Require at least OpenSSL 1.1.1, that's whe...

[Joeri van Ruth via checkin-list]

Changeset: 5ecccc97f86c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5ecccc97f86c
Modified Files:
        clients/mapilib/CMakeLists.txt
        cmake/monetdb-findpackages.cmake
        common/stream/CMakeLists.txt
Branch: monetdburl
Log Message:

Require at least OpenSSL 1.1.1, that's when TLSv1.3 was introduced


diffs (36 lines):

diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -23,7 +23,7 @@ target_sources(mapi
   connect.c
   msettings.c
   parseurl.c
-  $<$<BOOL:${HAVE_OPENSSL}>:connect_openssl.c>
+  $<$<BOOL:${OPENSSL_FOUND}>:connect_openssl.c>
   mapi_intern.h
   PUBLIC
   $<BUILD_INTERFACE:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/mapi.h>
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -128,7 +128,7 @@ if(WITH_MALLOC)
 endif()
 
 if(WITH_OPENSSL)
-  find_package(OpenSSL)
+  find_package(OpenSSL 1.1.1)
 endif()
 
 find_package(Sphinx)
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -39,7 +39,7 @@ target_sources(stream
   fwf.c
   iconv_stream.c
   text_stream.c
-  $<$<BOOL:${HAVE_OPENSSL}>:openssl_stream.c>
+  $<$<BOOL:${OPENSSL_FOUND}>:openssl_stream.c>
   pump.c
   stream.h
   stream_internal.h
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org