From 8738e93dc0e225369892f103969216a9f82e9a04 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 20 Apr 2010 13:25:46 +0200 Subject: cmake: Fixed openssl detection. Thanks to Xi Wang for the patch. --- CMakeLists.txt | 4 ++-- ConfigureChecks.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f24c4f..b5d5cb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,12 +52,12 @@ if (WITH_GCRYPT) endif (NOT GCRYPT_FOUND) else (WITH_GCRYPT) find_package(OpenSSL) - if (NOT CRYPTO_FOUND) + if (NOT OPENSSL_FOUND) find_package(GCrypt) if (NOT GCRYPT_FOUND) message(FATAL_ERROR "Could not find OpenSSL or GCrypt") endif (NOT GCRYPT_FOUND) - endif (NOT CRYPTO_FOUND) + endif (NOT OPENSSL_FOUND) endif(WITH_GCRYPT) # config.h checks diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 07fb7bf..fc755fb 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -82,9 +82,9 @@ endif (UNIX) set(LIBSSH_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "libssh required system libraries") # LIBRARIES -if (CRYPTO_FOUND) +if (OPENSSL_FOUND) set(HAVE_LIBCRYPTO 1) -endif (CRYPTO_FOUND) +endif (OPENSSL_FOUND) if (GCRYPT_FOUND) set(HAVE_LIBGCRYPT 1) -- cgit