3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

Fixes OpenSSL for qt5 (#25242)

Browse Source 
* copy v3 dlls, and add option to manually specificy the linkage

* Update versions

* Update versions/q-/qt5-base.json

* always link openssl for qt5

* Update version database

* fix package version

* fix package versions

* regenerate versions

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
Ian Reinhart Geiser 2022-06-28 19:55:44 +00:00 committed by GitHub
parent f505ef3197
commit 4a7ba299f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/qt5-base/portfile.cmake
View File

@ -1,12 +1,5 @@
vcpkg_buildpath_length_warning(37)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
set(QT_OPENSSL_LINK_DEFAULT ON)
else()
set(QT_OPENSSL_LINK_DEFAULT OFF)
endif()
option(QT_OPENSSL_LINK "Link against OpenSSL at compile-time." ${QT_OPENSSL_LINK_DEFAULT})
if (VCPKG_TARGET_IS_LINUX)
message(WARNING "qt5-base currently requires some packages from the system package manager, see https://doc.qt.io/qt-5/linux-requirements.html")
message(WARNING
@ -115,12 +108,9 @@ list(APPEND CORE_OPTIONS
-icu
-no-angle # Qt does not need to build angle. VCPKG will build angle!
-no-glib
-openssl-linked
)
if(QT_OPENSSL_LINK)
list(APPEND CORE_OPTIONS -openssl-linked)
endif()
if(WITH_PGSQL_PLUGIN)
list(APPEND CORE_OPTIONS -sql-psql)
else()

12
ports/qt5-base/qtdeploy.ps1
View File

@ -44,15 +44,15 @@ function deployPluginsIfQt([string]$targetBinaryDir, [string]$QtPluginsDir, [str
deployPlugins "styles"
} elseif ($targetBinaryName -match "Qt5Networkd?.dll") {
deployPlugins "bearer"
if (Test-Path "$binDir\libcrypto-1_1-x64.dll")
if (Test-Path "$binDir\libcrypto-*-x64.dll")
{
deployBinary "$targetBinaryDir" "$binDir" "libcrypto-1_1-x64.dll"
deployBinary "$targetBinaryDir" "$binDir" "libssl-1_1-x64.dll"
deployBinary "$targetBinaryDir" "$binDir" "libcrypto-*-x64.dll"
deployBinary "$targetBinaryDir" "$binDir" "libssl-*-x64.dll"
}
if (Test-Path "$binDir\libcrypto-1_1.dll")
if (Test-Path "$binDir\libcrypto-*.dll")
{
deployBinary "$targetBinaryDir" "$binDir" "libcrypto-1_1.dll"
deployBinary "$targetBinaryDir" "$binDir" "libssl-1_1.dll"
deployBinary "$targetBinaryDir" "$binDir" "libcrypto-*.dll"
deployBinary "$targetBinaryDir" "$binDir" "libssl-*.dll"
}
} elseif ($targetBinaryName -match "Qt5Sqld?.dll") {
deployPlugins "sqldrivers"

1
ports/qt5-base/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "qt5-base",
"version": "5.15.5",
"port-version": 1,
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,

2
versions/baseline.json
View File

@ -5746,7 +5746,7 @@
},
"qt5-base": {
"baseline": "5.15.5",
"port-version": 0
"port-version": 1
},
"qt5-canvas3d": {
"baseline": "0",

5
versions/q-/qt5-base.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "21a6678f36c765307bd8d36052790ab2d59a494d",
"version": "5.15.5",
"port-version": 1
},
{
"git-tree": "27c23b887623e05b6a536e0f5d587c8c98f70278",
"version": "5.15.5",