diff options
| author | Wayne Stambaugh <stambaughw@gmail.com> | 2015-10-03 15:40:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-06 15:55:46 (GMT) |
| commit | 1bf66fed674bc1b7c463bd230f7c66df8aa86e79 (patch) | |
| tree | 92d3a9d09c3f3ab6c7254b3a97789face06fa436 | |
| parent | 6b575dec8d393c4a38c587ee97afa068eeb4b432 (diff) | |
| download | CMake-1bf66fed674bc1b7c463bd230f7c66df8aa86e79.zip CMake-1bf66fed674bc1b7c463bd230f7c66df8aa86e79.tar.gz CMake-1bf66fed674bc1b7c463bd230f7c66df8aa86e79.tar.bz2 | |
FindOpenSSL: Search for unix-named libraries first on MinGW (#15765)
Generalize the change made by commit v2.8.10~228^2~4 (FindOpenSSL: find
cross-compiled OpenSSL from MinGW, 2012-07-23) to be used on builds
hosted on Windows too. When building for MinGW, consider library names
that come with MinGW before looking for the main Windows distribution of
OpenSSL.
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 3aea695..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} |