Changeset: 81fc237c7a6e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/81fc237c7a6e
Modified Files:
cmake/monetdb-defines.cmake
monetdb_config.h.in
Branch: Oct2020
Log Message:
Get this to compile on Fedora 36.
diffs (22 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -251,6 +251,7 @@ macro(monetdb_configure_crypto)
set(CRYPTO_LIBRARIES "${OPENSSL_CRYPTO_LIBRARY}" CACHE INTERNAL "crypto
libraries to link")
set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${CRYPTO_INCLUDE_DIR}")
set(CMAKE_REQUIRED_LIBRARIES
"${CMAKE_REQUIRED_LIBRARIES};${CRYPTO_LIBRARIES}")
+ set(CMAKE_REQUIRED_DEFINITIONS
"${CMAKE_REQUIRED_DEFINITIONS};-DOPENSSL_SUPPRESS_DEPRECATED=1")
check_symbol_exists("MD5_Update" "openssl/md5.h" HAVE_MD5_UPDATE)
check_symbol_exists("RIPEMD160_Update" "openssl/ripemd.h"
HAVE_RIPEMD160_UPDATE)
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -169,6 +169,7 @@
#cmakedefine HAVE_ICONV 1
#cmakedefine HAVE_PTHREAD_H 1
#cmakedefine HAVE_LIBPCRE 1
+#define OPENSSL_SUPPRESS_DEPRECATED
#cmakedefine HAVE_OPENSSL 1
#cmakedefine HAVE_COMMONCRYPTO 1
#cmakedefine HAVE_LIBBZ2 1
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
