Attached Files | 0001-OpenSSL-find-cross-compiled-OpenSSL-from-MinGW.patch [^] (871 bytes) 2012-07-23 04:50 [Show Content] [Hide Content]From 794b106fdb0919a04dab1ec3f5aacc4c00d02f5e Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 23 Jul 2012 10:49:14 +0200
Subject: [PATCH] OpenSSL: find cross-compiled OpenSSL from MinGW
---
Modules/FindOpenSSL.cmake | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index d1fc2d2..d04fe50 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -137,6 +137,7 @@ IF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(LIB_EAY
NAMES
libeay32
+ crypto
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
"lib"
@@ -146,6 +147,7 @@ IF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(SSL_EAY
NAMES
ssleay32
+ ssl
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
"lib"
--
1.7.7
0001-FindOpenSSL-find-cross-compiled-OpenSSL-from-MinGW-1.patch [^] (1,593 bytes) 2012-07-23 17:13 [Show Content] [Hide Content]From 247a5cac245694ebc5bfca712a9c37ff234bd1a8 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Mon, 23 Jul 2012 20:34:48 +0200
Subject: [PATCH] FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
Suggested-by: Dominik Schmidt <dev@dominik-schmidt.de>
---
Modules/FindOpenSSL.cmake | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index d1fc2d2..c19667d 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -134,9 +134,15 @@ IF(WIN32 AND NOT CYGWIN)
MARK_AS_ADVANCED(LIB_EAY_DEBUG LIB_EAY_RELEASE)
ELSEIF(MINGW)
# same player, for MingW
+ SET(LIB_EAY_NAMES libeay32)
+ SET(SSL_EAY_NAMES ssleay32)
+ IF(CMAKE_CROSS_COMPILING)
+ LIST(APPEND LIB_EAY_NAMES crypto)
+ LIST(APPEND SSL_EAY_NAMES ssl)
+ ENDIF()
FIND_LIBRARY(LIB_EAY
NAMES
- libeay32
+ ${LIB_EAY_NAMES}
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
"lib"
@@ -145,7 +151,7 @@ IF(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(SSL_EAY
NAMES
- ssleay32
+ ${SSL_EAY_NAMES}
${_OPENSSL_ROOT_HINTS_AND_PATHS}
PATH_SUFFIXES
"lib"
@@ -154,6 +160,8 @@ IF(WIN32 AND NOT CYGWIN)
MARK_AS_ADVANCED(SSL_EAY LIB_EAY)
set( OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY} )
+ unset(LIB_EAY_NAMES)
+ unset(SSL_EAY_NAMES)
ELSE(MSVC)
# Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
FIND_LIBRARY(LIB_EAY
--
1.7.7
|