diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-18 15:22:05 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-18 15:22:05 -0800 |
| commit | 3cd8d3e85696fba0c0962d07c9f3486c62dcafe8 (patch) | |
| tree | 26103826af2b25268fd4cc2f86b32718e77f0760 /ports/wt/0004-link-ssl.patch | |
| parent | bc79cf9a7c39067fcbd7765ec8129b232cb35da4 (diff) | |
| parent | d2b0798854c16d8644e3ba2f69ffd3baa448f4ec (diff) | |
| download | vcpkg-3cd8d3e85696fba0c0962d07c9f3486c62dcafe8.tar.gz vcpkg-3cd8d3e85696fba0c0962d07c9f3486c62dcafe8.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4951
Diffstat (limited to 'ports/wt/0004-link-ssl.patch')
| -rw-r--r-- | ports/wt/0004-link-ssl.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/ports/wt/0004-link-ssl.patch b/ports/wt/0004-link-ssl.patch new file mode 100644 index 000000000..8579223dc --- /dev/null +++ b/ports/wt/0004-link-ssl.patch @@ -0,0 +1,46 @@ +diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt +index c5f7bbc8..6e2c2f4d 100644 +--- a/cmake/WtFindSsl.txt ++++ b/cmake/WtFindSsl.txt +@@ -121,6 +121,16 @@ ELSEIF(APPLE) + /usr/local/lib + NO_DEFAULT_PATH + ) ++ FIND_LIBRARY(CRYPTO_LIB ++ NAMES ++ crypto ++ PATHS ++ ${SSL_PREFIX}/lib ++ ${SSL_PREFIX}/lib/VC ++ /usr/lib ++ /usr/local/lib ++ NO_DEFAULT_PATH ++ ) + ELSE (WIN32) + FIND_LIBRARY(SSL_LIB + NAMES +@@ -131,6 +141,15 @@ ELSE (WIN32) + /usr/lib + /usr/local/lib + ) ++ FIND_LIBRARY(CRYPTO_LIB ++ NAMES ++ crypto ++ PATHS ++ ${SSL_PREFIX}/lib ++ ${SSL_PREFIX}/lib/VC ++ /usr/lib ++ /usr/local/lib ++ ) + ENDIF (WIN32) + + IF(SSL_LIB +@@ -144,7 +163,7 @@ IF(SSL_LIB + ENDIF(SSL_TOO_LIB) + ELSE(WIN32) + SET(SSL_FOUND true) +- SET(SSL_LIBRARIES ${SSL_LIB} -lcrypto) ++ SET(SSL_LIBRARIES ${SSL_LIB} ${CRYPTO_LIB}) + ENDIF(WIN32) + ENDIF(SSL_LIB + AND SSL_INCLUDE_DIRS) |