| --- gdcm-2.8.8/CMake/FindOpenSSL.cmake.orig 2018-10-22 17:32:51.813839400 +0300 |
| +++ gdcm-2.8.8/CMake/FindOpenSSL.cmake 2018-10-22 17:41:15.940673800 +0300 |
| @@ -33,8 +33,8 @@ |
| "C:/OpenSSL-Win32/" |
| ) |
| find_path(OPENSSL_ROOT_DIR |
| - NAMES include/openssl/ssl.h |
| - HINTS ${_OPENSSL_ROOT_HINTS} |
| + NAMES openssl/ssl.h |
| + PATH_SUFFIXES include |
| PATHS ${_OPENSSL_ROOT_PATHS} |
| ) |
| mark_as_advanced(OPENSSL_ROOT_DIR) |
| @@ -85,11 +85,13 @@ |
| mark_as_advanced(LIB_EAY_DEBUG LIB_EAY_RELEASE) |
| elseif(MINGW) |
| # same player, for MingW |
| - find_library(LIB_EAY NAMES libeay32 |
| - PATHS ${OPENSSL_ROOT_DIR}/lib/MinGW |
| - ) |
| - find_library(SSL_EAY NAMES ssleay32 |
| - PATHS ${OPENSSL_ROOT_DIR}/lib/MinGW |
| + find_library(LIB_EAY NAMES crypto |
| + PATHS ${OPENSSL_ROOT_DIR} |
| + PATH_SUFFIXES lib lib/MingW |
| + ) |
| + find_library(SSL_EAY NAMES ssl |
| + PATHS ${OPENSSL_ROOT_DIR} |
| + PATH_SUFFIXES lib lib/MingW |
| ) |
| mark_as_advanced(SSL_EAY LIB_EAY) |
| set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} ) |