diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-08 18:10:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-08 18:10:57 (GMT) |
| commit | 29a2d9fe69a8561ff72f800b5f96bc896cd9d449 (patch) | |
| tree | 865f3c583608270e862691d14e0e7f67b3893ab8 | |
| parent | 750391afc19577be693dbe6dfe760903d2e70fc8 (diff) | |
| parent | 1bf66fed674bc1b7c463bd230f7c66df8aa86e79 (diff) | |
| download | CMake-29a2d9fe69a8561ff72f800b5f96bc896cd9d449.zip CMake-29a2d9fe69a8561ff72f800b5f96bc896cd9d449.tar.gz CMake-29a2d9fe69a8561ff72f800b5f96bc896cd9d449.tar.bz2 | |
Merge topic 'FindOpenSSL-mingw'
1bf66fed FindOpenSSL: Search for unix-named libraries first on MinGW (#15765)
6b575dec FindOpenSSL: Tolerate tabs in header while parsing version (#15765)
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index a0f4c52..8b4b988 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -200,12 +200,8 @@ if(WIN32 AND NOT CYGWIN) set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY} ) elseif(MINGW) # same player, for MinGW - set(LIB_EAY_NAMES libeay32) - set(SSL_EAY_NAMES ssleay32) - if(CMAKE_CROSSCOMPILING) - list(APPEND LIB_EAY_NAMES crypto) - list(APPEND SSL_EAY_NAMES ssl) - endif() + set(LIB_EAY_NAMES crypto libeay32) + set(SSL_EAY_NAMES ssl ssleay32) find_library(LIB_EAY NAMES ${LIB_EAY_NAMES} @@ -325,7 +321,7 @@ endfunction() if (OPENSSL_INCLUDE_DIR) if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str - REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") # The version number is encoded as 0xMNNFFPPS: major minor fix patch status # The status gives if this is a developer or prerelease and is ignored here. |