Merge pull request #2125 from akallabeth/win_build_fixes

Fixed openssl detection on windows.
2014-10-27 15:00:03 +01:00 · 2014-10-27 15:00:03 +01:00 · 6e1e1def76
commit 6e1e1def76
parent 2de73e0243 43d8f34e81
2 changed files with 6 additions and 0 deletions
--- 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)
--- 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}