Search for OpenSSL 1.1 on Windows

This commit is contained in:
Jason Haslam 2019-01-24 20:33:34 -07:00
parent 7a34e92bf6
commit 97b5667297
2 changed files with 2 additions and 6 deletions

View File

@ -4,8 +4,4 @@ else()
set(OPENSSL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/openssl CACHE PATH "")
endif()
if(WIN32)
set(OPENSSL_ROOT_DIR ${OPENSSL_DIR}/inc32 ${OPENSSL_DIR}/out32dll PARENT_SCOPE)
else()
set(OPENSSL_ROOT_DIR ${OPENSSL_DIR} PARENT_SCOPE)
endif()
set(OPENSSL_ROOT_DIR ${OPENSSL_DIR} PARENT_SCOPE)

View File

@ -159,7 +159,7 @@ if(NOT APPLE)
endif()
foreach(SSL_LIB_NAME ssl crypto)
set(SSL_LIB "${OPENSSL_LIB}/lib${SSL_LIB_NAME}${SSL_LIB_SUFFIX}")
set(SSL_LIB "${OPENSSL_DIR}/lib${SSL_LIB_NAME}${SSL_LIB_SUFFIX}")
if(WIN32)
# Copy into build dir.