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/caf/openssl-version-override.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/caf/openssl-version-override.patch')
| -rw-r--r-- | ports/caf/openssl-version-override.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ports/caf/openssl-version-override.patch b/ports/caf/openssl-version-override.patch index bccbd6ca4..5a0337134 100644 --- a/ports/caf/openssl-version-override.patch +++ b/ports/caf/openssl-version-override.patch @@ -1,14 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a7b75f7..794af1d 100644
+index 2d908e8..d270297 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -545,6 +545,9 @@ if(NOT CAF_NO_OPENSSL)
+@@ -495,6 +495,9 @@ if(NOT CAF_NO_OPENSSL)
message(STATUS
"Disable OpenSSL. Required >= 1.0.1 due to TLSv1.2 support.")
set(CAF_NO_OPENSSL yes)
+ elseif(CAF_OPENSSL_VERSION_OVERRIDE)
-+ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
-+ add_optional_caf_lib(openssl)
++ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
++ add_optional_caf_lib(openssl)
else()
- # Check if openssl headers and library versions match
- set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
+ if(NOT CMAKE_CROSSCOMPILING)
+ # Check if openssl headers and library versions match
|