From 9336ae3df6d818d9d74152d21b7dcb00a3097b72 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 10 Nov 2020 06:21:03 +0700 Subject: [szip, openssl] Fix problems with mingw (#14460) * [openssl] Use the unix portfile when building with mingw * [mingw triplets] Add architecture check exceptions for szip --- triplets/community/arm-mingw-dynamic.cmake | 3 +++ triplets/community/arm64-mingw-dynamic.cmake | 3 +++ triplets/community/x64-mingw-dynamic.cmake | 3 +++ triplets/community/x86-mingw-dynamic.cmake | 3 +++ 4 files changed, 12 insertions(+) (limited to 'triplets') 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() -- cgit v1.2.3