From 3d00ddf2968711d071b537b27c3ec208b584cbdc Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 15 Nov 2013 21:52:45 +0100 Subject: Allow using blowfish from OpenSSL on systems where it's available anyways --- cmake/config.cmake | 1 + cmake/deps.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+) (limited to 'cmake') diff --git a/cmake/config.cmake b/cmake/config.cmake index cc5ca01..110ad1a 100644 --- a/cmake/config.cmake +++ b/cmake/config.cmake @@ -18,6 +18,7 @@ endif() set(WITH_CAPABILITIES ${LINUX} CACHE BOOL "Include support for POSIX capabilities") set(USE_LIBSODIUM FALSE CACHE BOOL "Use libsodium instead of NaCl") +set(USE_OPENSSL FALSE CACHE BOOL "Use OpenSSL") set(WITH_CMDLINE_USER TRUE CACHE BOOL "Include support for setting user/group related options on the command line") set(WITH_CMDLINE_LOGGING TRUE CACHE BOOL "Include support for setting logging related options on the command line") diff --git a/cmake/deps.cmake b/cmake/deps.cmake index c3936af..76f5296 100644 --- a/cmake/deps.cmake +++ b/cmake/deps.cmake @@ -42,6 +42,17 @@ endif(USE_LIBSODIUM) set_property(GLOBAL PROPERTY NACL_REQUIRED FALSE) +if(USE_OPENSSL) + pkg_check_modules(OPENSSL_CRYPTO REQUIRED libcrypto) +else(USE_OPENSSL) + set(OPENSSL_CRYPTO_INCLUDE_DIRS "") + set(OPENSSL_CRYPTO_CFLAGS_OTHER "") + set(OPENSSL_CRYPTO_LIBRARY_DIRS "") + set(OPENSSL_CRYPTO_LIBRARIES "") + set(OPENSSL_CRYPTO_LDFLAGS_OTHER "") +endif(USE_OPENSSL) + + if(WITH_CAPABILITIES) find_package(CAP REQUIRED) else(WITH_CAPABILITIES) -- cgit v1.2.3