Changeset: 50e9b26a4e4c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/50e9b26a4e4c Modified Files: cmake/monetdb-defines.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-functions.cmake cmake/monetdb-options.cmake common/stream/CMakeLists.txt monetdb_config.h.in Branch: monetdburl Log Message:
Add CMake magic for OpenSSL diffs (72 lines): diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake --- a/cmake/monetdb-defines.cmake +++ b/cmake/monetdb-defines.cmake @@ -153,6 +153,7 @@ macro(monetdb_macro_variables) set(HAVE_SHP ${GDAL_FOUND}) set(SANITIZER ${SANITIZER}) set(HAVE_RTREE ${RTREE_FOUND}) + set(HAVE_OPENSSL ${OPENSSL_FOUND}) if(PY3INTEGRATION) set(HAVE_LIBPY3 "${Python3_NumPy_FOUND}") diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake --- a/cmake/monetdb-findpackages.cmake +++ b/cmake/monetdb-findpackages.cmake @@ -127,6 +127,10 @@ if(WITH_MALLOC) endif() endif() +if(WITH_OPENSSL) + find_package(OpenSSL) +endif() + find_package(Sphinx) find_package(Createrepo) find_package(Rpmbuild) diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake --- a/cmake/monetdb-functions.cmake +++ b/cmake/monetdb-functions.cmake @@ -105,6 +105,7 @@ function(monetdb_cmake_summary) message(STATUS "Netcdf library: ${NETCDF_FOUND}") message(STATUS "Readline library: ${READLINE_FOUND}") message(STATUS "R library: ${LIBR_FOUND}") + message(STATUS "OpenSSL: ${OPENSSL_FOUND}") message(STATUS "ODBC: ${ODBC_FOUND}") message(STATUS "Sphinx: ${SPHINX_FOUND}") message(STATUS "Createrepo: ${CREATEREPO_FOUND}") diff --git a/cmake/monetdb-options.cmake b/cmake/monetdb-options.cmake --- a/cmake/monetdb-options.cmake +++ b/cmake/monetdb-options.cmake @@ -143,6 +143,10 @@ option(WITH_ZLIB "Include zlib support" ON) +option(WITH_OPENSSL + "Include TLS support" + ON) + option(CMAKE_SUMMARY "Show a summary of the cmake configuration (for debug purposes)" OFF) diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt --- a/common/stream/CMakeLists.txt +++ b/common/stream/CMakeLists.txt @@ -67,6 +67,7 @@ target_link_libraries(stream $<$<BOOL:${LIBLZMA_FOUND}>:LibLZMA::LibLZMA> $<$<BOOL:${LZ4_FOUND}>:LZ4::LZ4> $<$<BOOL:${Iconv_FOUND}>:Iconv::Iconv> + $<$<BOOL:${OPENSSL_FOUND}>:OpenSSL::SSL> matomic monetdb_config_header $<$<PLATFORM_ID:Windows>:ws2_32> diff --git a/monetdb_config.h.in b/monetdb_config.h.in --- a/monetdb_config.h.in +++ b/monetdb_config.h.in @@ -196,6 +196,7 @@ #cmakedefine HAVE_RTREE 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