From e715379e49483f8200abec5bc7ff48f70d73a0cf Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 13 Mar 2014 15:09:17 +0100 Subject: Rename USE_LIBSODIUM and USE_OPENSSL cmake flags to ENABLE_LIBSODIUM and ENABLE_OPENSSL --- cmake/deps.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cmake/deps.cmake') diff --git a/cmake/deps.cmake b/cmake/deps.cmake index 76f5296..d9dff1e 100644 --- a/cmake/deps.cmake +++ b/cmake/deps.cmake @@ -16,7 +16,7 @@ set(NACL_LIBRARY_DIRS "") set(NACL_LIBRARIES "") set(NACL_LDFLAGS_OTHER "") -if(USE_LIBSODIUM) +if(ENABLE_LIBSODIUM) pkg_check_modules(SODIUM libsodium) if(SODIUM_FOUND) @@ -30,27 +30,27 @@ if(USE_LIBSODIUM) set(NACL_LIBRARIES "${SODIUM_LIBRARIES}") set(NACL_LDFLAGS_OTHER "${SODIUM_LDFLAGS_OTHER}") endif(SODIUM_FOUND) -else(USE_LIBSODIUM) +else(ENABLE_LIBSODIUM) find_package(NaCl) if(NACL_FOUND) set(NACL_INCLUDE_DIRS "${NACL_INCLUDE_DIR}") set(NACL_LIBRARIES "${NACL_LIBRARY}") endif(NACL_FOUND) -endif(USE_LIBSODIUM) +endif(ENABLE_LIBSODIUM) set_property(GLOBAL PROPERTY NACL_REQUIRED FALSE) -if(USE_OPENSSL) +if(ENABLE_OPENSSL) pkg_check_modules(OPENSSL_CRYPTO REQUIRED libcrypto) -else(USE_OPENSSL) +else(ENABLE_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) +endif(ENABLE_OPENSSL) if(WITH_CAPABILITIES) -- cgit v1.2.3