Changeset: 8128a4d74ade for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8128a4d74ade
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Fixed push/pop cmake state for crypto libraries.
diffs (35 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -776,6 +776,7 @@ if(NOT UUID_FOUND)
endif()
# OpenSSL or CommonCrypto library
+cmake_push_check_state()
if(APPLE)
set(CRYPTO_LIBRARY_NAME "CommonCrypto")
include(FindCommonCrypto)
@@ -784,7 +785,6 @@ if(APPLE)
set(HAVE_COMMONCRYPTO ON)
set(CRYPTO_INCLUDE_DIR "${COMMONCRYPTO_INCLUDE_DIR}")
set(CRYPTO_LIBRARIES "${COMMONCRYPTO_LIBRARIES}")
- 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)
@@ -794,7 +794,6 @@ if(APPLE)
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)
@@ -826,6 +825,7 @@ if(NOT COMMONCRYPTO_FOUND)
endif()
endif()
endif()
+cmake_pop_check_state()
if(NOT COMMONCRYPTO_FOUND AND NOT OPENSSL_FOUND)
if(${ENABLE_MONETDB5} STREQUAL "YES")
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
