mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:11:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[szip, openssl] Fix problems with mingw (#14460)

Browse Source 
* [openssl] Use the unix portfile when building with mingw

* [mingw triplets] Add architecture check exceptions for szip
This commit is contained in:
Long Nguyen 2020-11-10 06:21:03 +07:00 committed by GitHub
parent 4ebf188da4
commit 9336ae3df6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/openssl/CONTROL
View File

@ -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.

2
ports/openssl/portfile.cmake
View File

@ -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")

3
triplets/community/arm-mingw-dynamic.cmake
View File

@ -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()

3
triplets/community/arm64-mingw-dynamic.cmake
View File

@ -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()

3
triplets/community/x64-mingw-dynamic.cmake
View File

@ -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()

3
triplets/community/x86-mingw-dynamic.cmake
View File

@ -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()