From: Michihiro NAKAJIMA Date: Tue, 14 Oct 2014 12:09:38 +0000 (+0900) Subject: Fix a lack of definitions for OpenSSL library on CMake build system. X-Git-Tag: v3.1.900a~170 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86b9097ea110ff4cd7cc95fc80d7f28cdd1de4e5;p=thirdparty%2Flibarchive.git Fix a lack of definitions for OpenSSL library on CMake build system. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f6cc4481..9f18c8bce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -624,6 +624,9 @@ ENDIF(ENABLE_NETTLE) # IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") FIND_PACKAGE(OpenSSL) + IF(OPENSSL_FOUND) + SET(HAVE_LIBCRYPTO 1) + ENDIF(OPENSSL_FOUND) ELSE() SET(OPENSSL_FOUND FALSE) # Override cached value ENDIF() diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in index a08c3bd86..7d7230e55 100644 --- a/build/cmake/config.h.in +++ b/build/cmake/config.h.in @@ -585,6 +585,12 @@ typedef uint64_t uintmax_t; /* Define to 1 if you have the `bz2' library (-lbz2). */ #cmakedefine HAVE_LIBBZ2 1 +/* Define to 1 if you have the `charset' library (-lcharset). */ +#cmakedefine HAVE_LIBCHARSET 1 + +/* Define to 1 if you have the `crypto' library (-lcrypto). */ +#cmakedefine HAVE_LIBCRYPTO 1 + /* Define to 1 if you have the `expat' library (-lexpat). */ #cmakedefine HAVE_LIBEXPAT 1