diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2020-11-10 06:21:03 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 15:21:03 -0800 |
| commit | 9336ae3df6d818d9d74152d21b7dcb00a3097b72 (patch) | |
| tree | 377f72c5272932f843b1b6521958652d8c05b1fa /ports | |
| parent | 4ebf188da4847a3fa70bd82dac7fd51eac5a3d31 (diff) | |
| download | vcpkg-9336ae3df6d818d9d74152d21b7dcb00a3097b72.tar.gz vcpkg-9336ae3df6d818d9d74152d21b7dcb00a3097b72.zip | |
[szip, openssl] Fix problems with mingw (#14460)
* [openssl] Use the unix portfile when building with mingw
* [mingw triplets] Add architecture check exceptions for szip
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/openssl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 469f8305a..9efc2f76c 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,5 +1,5 @@ Source: openssl Version: 1.1.1h -Port-Version: 1 +Port-Version: 2 Homepage: https://www.openssl.org 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/portfile.cmake b/ports/openssl/portfile.cmake index 2d2622e6f..e4619e354 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_add_to_path("${PERL_EXE_PATH}") if(VCPKG_TARGET_IS_UWP) include("${CMAKE_CURRENT_LIST_DIR}/uwp/portfile.cmake") -elseif(VCPKG_TARGET_IS_WINDOWS) +elseif(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) include("${CMAKE_CURRENT_LIST_DIR}/windows/portfile.cmake") else() include("${CMAKE_CURRENT_LIST_DIR}/unix/portfile.cmake") |