diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-08 10:52:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 10:52:14 -0700 |
| commit | b49c739129dfbc6a13e2881494084119fc221a5e (patch) | |
| tree | e43a7dbd5b082bcda3f907933d143d00f40f44b0 /ports/openssl-windows | |
| parent | fb47d74d6d6d6f0c0497c8c9b50830b9b47f754c (diff) | |
| parent | 97b7134f41b48963345ef3d6bdf950c8d569d43d (diff) | |
| download | vcpkg-b49c739129dfbc6a13e2881494084119fc221a5e.tar.gz vcpkg-b49c739129dfbc6a13e2881494084119fc221a5e.zip | |
Merge pull request #5702 from kiwixz/pr/cmake_3_14
Update to cmake 3.14 (allow compilation with VS2019RC v142)
Diffstat (limited to 'ports/openssl-windows')
| -rw-r--r-- | ports/openssl-windows/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl-windows/portfile.cmake | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL index a62c2fbdc..d38ee9776 100644 --- a/ports/openssl-windows/CONTROL +++ b/ports/openssl-windows/CONTROL @@ -1,3 +1,3 @@ Source: openssl-windows -Version: 1.0.2q +Version: 1.0.2q-1 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library. diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake index 8a95bd6c1..f329126d3 100644 --- a/ports/openssl-windows/portfile.cmake +++ b/ports/openssl-windows/portfile.cmake @@ -6,7 +6,7 @@ include(vcpkg_common_functions) set(OPENSSL_VERSION 1.0.2q) set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION}) -vcpkg_find_acquire_program(PERL) +vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") @@ -20,10 +20,11 @@ vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${MASTER_COPY_SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch - ${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch - ${CMAKE_CURRENT_LIST_DIR}/EnableWinARM32.patch - ${CMAKE_CURRENT_LIST_DIR}/EmbedSymbolsInStaticLibsZ7.patch + PATCHES + ConfigureIncludeQuotesFix.patch + STRINGIFYPatch.patch + EnableWinARM32.patch + EmbedSymbolsInStaticLibsZ7.patch ) vcpkg_find_acquire_program(NASM) |