mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2125 from akallabeth/win_build_fixes

Browse Source 
Fixed openssl detection on windows.
This commit is contained in:
Martin Fleisz 2014-10-27 15:00:03 +01:00
commit 6e1e1def76
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -250,6 +250,10 @@ if(WIN32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINVER=0x0602 -DWIN32_WINNT=0x0602") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINVER=0x0602 -DWIN32_WINNT=0x0602")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWINVER=0x0602 -DWIN32_WINNT=0x0602") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWINVER=0x0602 -DWIN32_WINNT=0x0602")
endif() endif()
if (FREERDP_EXTERNAL_SSL_PATH)
set(OPENSSL_ROOT_DIR ${FREERDP_EXTERNAL_SSL_PATH})
endif()
endif() endif()
if(IOS) if(IOS)

2
cmake/FindOpenSSL.cmake
View File

@ -54,6 +54,8 @@ SET(_OPENSSL_ROOT_HINTS_AND_PATHS
FIND_PATH(OPENSSL_INCLUDE_DIR FIND_PATH(OPENSSL_INCLUDE_DIR
NAMES NAMES
openssl/ssl.h openssl/ssl.h
PATH_SUFFIXES
"include"
HINTS HINTS
${_OPENSSL_INCLUDEDIR} ${_OPENSSL_INCLUDEDIR}
${_OPENSSL_ROOT_HINTS_AND_PATHS} ${_OPENSSL_ROOT_HINTS_AND_PATHS}