From: Michael Wallner Date: Thu, 23 Sep 2021 09:24:01 +0000 (+0200) Subject: Merge pull request #122 from TomasKorbar/v1.x X-Git-Tag: 1.1.2~9 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=aa88329b9cba58d52b81da31207968d184e9c0fa;hp=6079c0e29529bf9dd13ef1ed89c046672e1a3121;p=awesomized%2Flibmemcached Merge pull request #122 from TomasKorbar/v1.x If libcrypto implementation of AES is used, do not compile internal --- diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt index b820d27b..fb732fcf 100644 --- a/src/libhashkit/CMakeLists.txt +++ b/src/libhashkit/CMakeLists.txt @@ -17,7 +17,6 @@ set(libhashkit_sources murmur3.cc murmur3_api.cc one_at_a_time.cc - rijndael.cc str_algorithm.cc strerror.cc string.cc @@ -53,6 +52,10 @@ if(ENABLE_OPENSSL_CRYPTO) endif() endif() +if (NOT OPENSSL_CRYPTO_LIBRARY) + set (libhashkit_sources ${libhashkit_sources} rijndael.cc) +endif() + configure_file(hashkitcon.h.in hashkitcon.h @ONLY) install(TARGETS libhashkit EXPORT libhashkit-targets