Changeset: 900ebc57331c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=900ebc57331c
Modified Files:
CMakeLists.txt
testing/CMakeLists.txt
Branch: cmake-fun
Log Message:
Fixed installation script, plus I realized that we should check for OpenSSL
symbols too.
diffs (46 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -805,13 +805,23 @@ if(NOT COMMONCRYPTO_FOUND)
set(HAVE_OPENSSL ON)
set(CRYPTO_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}")
set(CRYPTO_LIBRARIES "${OPENSSL_CRYPTO_LIBRARY}")
- set(HAVE_MD5_UPDATE ON)
- set(HAVE_RIPEMD160_UPDATE ON)
- set(HAVE_SHA1_UPDATE ON)
- set(HAVE_SHA224_UPDATE ON)
- set(HAVE_SHA256_UPDATE ON)
- set(HAVE_SHA384_UPDATE ON)
- set(HAVE_SHA512_UPDATE ON)
+ if(MSVC)
+ set(HAVE_MD5_UPDATE ON)
+ set(HAVE_RIPEMD160_UPDATE ON)
+ set(HAVE_SHA1_UPDATE ON)
+ set(HAVE_SHA224_UPDATE ON)
+ set(HAVE_SHA256_UPDATE ON)
+ set(HAVE_SHA384_UPDATE ON)
+ set(HAVE_SHA512_UPDATE ON)
+ else()
+ check_symbol_exists("MD5_Update" "openssl/md5.h"
HAVE_MD5_UPDATE)
+ check_symbol_exists("RIPEMD160_Update"
"openssl/ripemd.h" HAVE_RIPEMD160_UPDATE)
+ check_symbol_exists("SHA1_Update" "openssl/sha.h"
HAVE_SHA1_UPDATE)
+ check_symbol_exists("SHA224_Update" "openssl/sha.h"
HAVE_SHA224_UPDATE)
+ check_symbol_exists("SHA256_Update" "openssl/sha.h"
HAVE_SHA256_UPDATE)
+ check_symbol_exists("SHA384_Update" "openssl/sha.h"
HAVE_SHA384_UPDATE)
+ check_symbol_exists("SHA512_Update" "openssl/sha.h"
HAVE_SHA512_UPDATE)
+ endif()
endif()
endif()
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -66,7 +66,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
if(PYTHON_LIBDIR)
install(FILES Mfilter.py process.py
${CMAKE_CURRENT_BINARY_DIR}/monet_options.py __init__.py
${CMAKE_CURRENT_BINARY_DIR}/listexports.py
exportutils.py malcheck.py
- DESTINATION
${CMAKE_INSTALL_PREFIX}${PYTHON_LIBDIR}/MonetDBtesting)
+ DESTINATION
${CMAKE_INSTALL_PREFIX}/${PYTHON_LIBDIR}/MonetDBtesting)
endif()
if(WIN32)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
