diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-04-04 15:46:02 -0700 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-04-04 15:46:02 -0700 |
| commit | 9ff9817a40084cb8dc94bc0f8332632a36c92346 (patch) | |
| tree | d39900ef8886534e7171b2a373a061f2f958eb11 /ports/openssl-windows | |
| parent | e33ffb6f905fb6c7446003ce15028bc1f5606cf7 (diff) | |
| parent | f0040c333959f4febcc528fb134b025713e54542 (diff) | |
| download | vcpkg-9ff9817a40084cb8dc94bc0f8332632a36c92346.tar.gz vcpkg-9ff9817a40084cb8dc94bc0f8332632a36c92346.zip | |
Merge branch 'pr/cmake_3_14' of https://github.com/kiwixz/vcpkg into dev/grdowns/5702
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) |