]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
2 | index f23dd5a..fd9e8ed 100644 | |
3 | --- a/CMakeLists.txt | |
4 | +++ b/CMakeLists.txt | |
5 | @@ -315,11 +315,12 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) | |
6 | FIND_PACKAGE(ZLIB REQUIRED) | |
7 | MESSAGE("Found zlib headers in ${ZLIB_INCLUDE_DIR}, library at ${ZLIB_LIBRARIES}") | |
8 | ||
9 | -FIND_PACKAGE(LIBCRYPTO) | |
10 | +FIND_PACKAGE(OpenSSL) | |
11 | ||
12 | -IF(LIBCRYPTO_FOUND) | |
13 | +IF(OpenSSL_FOUND) | |
14 | SET(PODOFO_HAVE_OPENSSL TRUE) | |
15 | - INCLUDE_DIRECTORIES(${LIBCRYPTO_INCLUDE_DIR}) | |
16 | + LIST(APPEND OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) | |
17 | + ADD_DEFINITIONS(-DPODOFO_HAVE_OPENSSL_1_1) | |
18 | MESSAGE("Found OpenSSL's libCrypto headers in ${LIBCRYPTO_INCLUDE_DIR}, library at ${LIBCRYPTO_LIBRARIES}") | |
19 | ELSE(LIBCRYPTO_FOUND) | |
20 | MESSAGE("OpenSSL's libCrypto not found. Encryption support will be disabled") | |
21 | @@ -396,8 +397,6 @@ ENDIF(CppUnit_FOUND) | |
22 | ||
23 | ENDIF(NOT PODOFO_BUILD_LIB_ONLY) | |
24 | ||
25 | -FIND_PACKAGE(OpenSSL) | |
26 | - | |
27 | FIND_PACKAGE(FREETYPE REQUIRED) | |
28 | MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}") | |
29 |