MonetDB: cmake-fun - This is now working on Windows.

[Pedro Ferreira]

Changeset: 4c2d2bbd1f57 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c2d2bbd1f57
Modified Files:
        CMakeLists.txt
Branch: cmake-fun
Log Message:

This is now working on Windows.


diffs (38 lines):

diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,25 +313,15 @@ if(NOT COMMONCRYPTO_FOUND)
                set(HAVE_OPENSSL ON CACHE INTERNAL "OpenSSL is available")
                set(CRYPTO_INCLUDE_DIR "${OPENSSL_INCLUDE_DIR}" CACHE INTERNAL 
"crypto include directory")
                set(CRYPTO_LIBRARIES "${OPENSSL_CRYPTO_LIBRARY}" CACHE INTERNAL 
"crypto libraries to link")
-               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()
-                       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)
-               endif()
+               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)
        endif()
 endif()
 cmake_pop_check_state()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list