Changeset: 5bf10cf8bd0e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5bf10cf8bd0e
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Try to find CommonCrypto library first, if not then try OpenSSL.
diffs (95 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -784,61 +784,54 @@ if(APPLE)
set(HAVE_COMMONCRYPTO ON)
set(CRYPTO_INCLUDE_DIR "${COMMONCRYPTO_INCLUDE_DIR}")
set(CRYPTO_LIBRARIES "${COMMONCRYPTO_LIBRARIES}")
- endif()
-else()
- set(WITH_OPENSSL "YES" CACHE STRING "Include OpenSSL support
(default=YES)") # Check with OPENSSL_FOUND
- if(NOT ${WITH_OPENSSL} STREQUAL "NO")
- set(CRYPTO_LIBRARY_NAME "OpenSSL")
- find_package(OpenSSL)
-
- if(OPENSSL_FOUND)
- set(HAVE_OPENSSL ON)
- set(CRYPTO_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}")
- set(CRYPTO_LIBRARIES "${OPENSSL_CRYPTO_LIBRARY}")
- endif()
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${CRYPTO_INCLUDE_DIR}")
+ set(CMAKE_REQUIRED_LIBRARIES
"${CMAKE_REQUIRED_LIBRARIES};${CRYPTO_LIBRARIES}")
+ check_symbol_exists("CC_MD5_Update"
"CommonCrypto/CommonDigest.h" HAVE_MD5_UPDATE)
+ check_symbol_exists("CC_RIPEMD160_Update"
"CommonCrypto/CommonDigest.h" HAVE_RIPEMD160_UPDATE)
+ check_symbol_exists("CC_SHA1_Update"
"CommonCrypto/CommonDigest.h" HAVE_SHA1_UPDATE)
+ check_symbol_exists("CC_SHA224_Update"
"CommonCrypto/CommonDigest.h" HAVE_SHA224_UPDATE)
+ check_symbol_exists("CC_SHA256_Update"
"CommonCrypto/CommonDigest.h" HAVE_SHA256_UPDATE)
+ check_symbol_exists("CC_SHA384_Update"
"CommonCrypto/CommonDigest.h" HAVE_SHA384_UPDATE)
+ check_symbol_exists("CC_SHA512_Update"
"CommonCrypto/CommonDigest.h" HAVE_SHA512_UPDATE)
+ cmake_pop_check_state()
endif()
endif()
+if(NOT COMMONCRYPTO_FOUND)
+ set(CRYPTO_LIBRARY_NAME "OpenSSL")
+ find_package(OpenSSL)
-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()
- cmake_push_check_state()
- set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${CRYPTO_INCLUDE_DIR}")
- set(CMAKE_REQUIRED_LIBRARIES
"${CMAKE_REQUIRED_LIBRARIES};${CRYPTO_LIBRARIES}")
-
- 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)
- cmake_pop_check_state()
+ if(OPENSSL_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)
+ endif()
endif()
if(NOT COMMONCRYPTO_FOUND AND NOT OPENSSL_FOUND)
if(${ENABLE_MONETDB5} STREQUAL "YES")
- message(FATAL_ERROR "${CRYPTO_LIBRARY_NAME} library not found
but required for MonetDB5")
+ message(FATAL_ERROR "Neither OpenSSL or CommonCrypto library
found, but required for MonetDB5")
else()
set(ENABLE_MONETDB5 "NO")
- set(WHY_NOT_MONETDB5 "${CRYPTO_LIBRARY_NAME} library not found
but required for MonetDB5")
+ set(WHY_NOT_MONETDB5 "Neither OpenSSL or CommonCrypto library
found, but required for MonetDB5")
message(WARNING "${WHY_NOT_MONETDB5}")
endif()
endif()
if(NOT HAVE_${PASSWORD_BACKEND}_UPDATE)
if(${ENABLE_MONETDB5} STREQUAL "YES")
- message(FATAL_ERROR "${CRYPTO_LIBRARY_NAME} library found but
checksum algorithm required for MonetDB5 not found")
+ message(FATAL_ERROR "${CRYPTO_LIBRARY_NAME} library found, but
checksum algorithm required for MonetDB5 not found")
else()
set(HAVE_COMMONCRYPTO NO)
set(OPENSSL_FOUND NO)
set(ENABLE_MONETDB5 "NO")
- set(WHY_NOT_MONETDB5 "${CRYPTO_LIBRARY_NAME} library found but
required checksum algorithm not found, so disabling")
+ set(WHY_NOT_MONETDB5 "${CRYPTO_LIBRARY_NAME} library found, but
required checksum algorithm not found, so disabling")
message(WARNING "${WHY_NOT_MONETDB5}")
endif()
endif()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
