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 /triplets | |
| 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 'triplets')
| -rw-r--r-- | triplets/community/arm-mingw-dynamic.cmake | 3 | ||||
| -rw-r--r-- | triplets/community/arm64-mingw-dynamic.cmake | 3 | ||||
| -rw-r--r-- | triplets/community/x64-mingw-dynamic.cmake | 3 | ||||
| -rw-r--r-- | triplets/community/x86-mingw-dynamic.cmake | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/triplets/community/arm-mingw-dynamic.cmake b/triplets/community/arm-mingw-dynamic.cmake index b23870c11..f38a7cfc0 100644 --- a/triplets/community/arm-mingw-dynamic.cmake +++ b/triplets/community/arm-mingw-dynamic.cmake @@ -5,3 +5,6 @@ set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+if(PORT STREQUAL "szip") + set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) +endif() diff --git a/triplets/community/arm64-mingw-dynamic.cmake b/triplets/community/arm64-mingw-dynamic.cmake index 30ed204ed..a90b4f241 100644 --- a/triplets/community/arm64-mingw-dynamic.cmake +++ b/triplets/community/arm64-mingw-dynamic.cmake @@ -5,3 +5,6 @@ set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) +if(PORT STREQUAL "szip") + set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) +endif() diff --git a/triplets/community/x64-mingw-dynamic.cmake b/triplets/community/x64-mingw-dynamic.cmake index 1f132cfe1..ff4845c33 100644 --- a/triplets/community/x64-mingw-dynamic.cmake +++ b/triplets/community/x64-mingw-dynamic.cmake @@ -5,3 +5,6 @@ set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+if(PORT STREQUAL "szip") + set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) +endif() diff --git a/triplets/community/x86-mingw-dynamic.cmake b/triplets/community/x86-mingw-dynamic.cmake index 000b36d96..b27397187 100644 --- a/triplets/community/x86-mingw-dynamic.cmake +++ b/triplets/community/x86-mingw-dynamic.cmake @@ -5,3 +5,6 @@ set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+if(PORT STREQUAL "szip") + set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) +endif() |