Changeset: e52769a2cdbf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e52769a2cdbf
Modified Files:
cmake/monetdb-defines.cmake
common/stream/CMakeLists.txt
common/stream/socket_stream.c
monetdb_config.h.in
Branch: smapi
Log Message:
Set up OpenSSL for use
diffs (47 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -148,6 +148,7 @@ macro(monetdb_macro_variables)
set(RHOME "${LIBR_HOME}")
set(HAVE_GEOM ${GEOS_FOUND})
set(HAVE_SHP ${GDAL_FOUND})
+ set(HAVE_OPENSSL ${OPENSSL_FOUND})
if(PY3INTEGRATION)
set(HAVE_LIBPY3 "${Python3_NumPy_FOUND}")
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -66,6 +66,7 @@ target_link_libraries(stream
$<$<BOOL:${LZ4_FOUND}>:LZ4::LZ4>
$<$<BOOL:${SNAPPY_FOUND}>:SNAPPY::SNAPPY>
$<$<BOOL:${Iconv_FOUND}>:Iconv::Iconv>
+ $<$<BOOL:${OPENSSL_FOUND}>:OpenSSL::SSL>
matomic
monetdb_config_header
$<$<PLATFORM_ID:Windows>:ws2_32>
diff --git a/common/stream/socket_stream.c b/common/stream/socket_stream.c
--- a/common/stream/socket_stream.c
+++ b/common/stream/socket_stream.c
@@ -14,6 +14,10 @@
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+#ifdef HAVE_OPENSSL
+#include <openssl/ssl.h>
+#endif
+
/* ------------------------------------------------------------------ */
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -197,6 +197,7 @@
#cmakedefine HAVE_GEOM 1
#cmakedefine HAVE_SHP 1
#cmakedefine HAVE_LIBPY3 1
+#cmakedefine HAVE_OPENSSL 1
// #cmakedefine SOCKET_LIBRARIES
#cmakedefine HAVE_GETADDRINFO 1
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
