diff options
| -rw-r--r-- | ports/openssl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 2 | ||||
| -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 |
6 files changed, 14 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") 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() |