From 43d8f34e8132a2942ae57376ed6fb4c23b9482fc Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Fri, 26 Sep 2014 11:16:04 +0200 Subject: [PATCH] Fixed openssl detection on windows. --- CMakeLists.txt | 4 ++++ cmake/FindOpenSSL.cmake | 2 ++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c98e76f5..fb986c3ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,6 +250,10 @@ if(WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINVER=0x0602 -DWIN32_WINNT=0x0602") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWINVER=0x0602 -DWIN32_WINNT=0x0602") endif() + + if (FREERDP_EXTERNAL_SSL_PATH) + set(OPENSSL_ROOT_DIR ${FREERDP_EXTERNAL_SSL_PATH}) + endif() endif() if(IOS) diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake index ee446f6e1..348d52729 100644 --- a/cmake/FindOpenSSL.cmake +++ b/cmake/FindOpenSSL.cmake @@ -54,6 +54,8 @@ SET(_OPENSSL_ROOT_HINTS_AND_PATHS FIND_PATH(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h + PATH_SUFFIXES + "include" HINTS ${_OPENSSL_INCLUDEDIR} ${_OPENSSL_ROOT_HINTS_AND_PATHS}