aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralexander-smyslov <37107500+alexander-smyslov@users.noreply.github.com>2020-09-24 20:54:11 +0200
committerGitHub <noreply@github.com>2020-09-24 11:54:11 -0700
commit7bc2ec295ba580a87fbda3d1efe11fdd0dad24d5 (patch)
treee6ecc10557a35fa1b72bc6819903178a4d582ce0
parentd961529d7ffd822390b229dbd8ad29a94630dda0 (diff)
downloadvcpkg-7bc2ec295ba580a87fbda3d1efe11fdd0dad24d5.tar.gz
vcpkg-7bc2ec295ba580a87fbda3d1efe11fdd0dad24d5.zip
[qt5] Install Qt5 Network SSL dependencies (#13599)
* Add files via upload * [new port] avro-cpp * add boost-format * remove comments * remove comments * fix copy ssl libraries * fix * bump version Co-authored-by: Alexander Smyslov <aleksandr.smyslov@libertexgroup.com> Co-authored-by: Smyslov Alexander Nikolayevich <aleksandr.smyslov@fxclub.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
-rw-r--r--ports/qt5-base/CONTROL2
-rw-r--r--ports/qt5-base/qtdeploy.ps15
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index 28247c42d..8f4c07f40 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,6 +1,6 @@
Source: qt5-base
Version: 5.15.0
-Port-Version: 2
+Port-Version: 3
Homepage: https://www.qt.io/
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
diff --git a/ports/qt5-base/qtdeploy.ps1 b/ports/qt5-base/qtdeploy.ps1
index 2372801a7..5b8e06ee9 100644
--- a/ports/qt5-base/qtdeploy.ps1
+++ b/ports/qt5-base/qtdeploy.ps1
@@ -44,6 +44,11 @@ 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")
+ {
+ deployBinary "$targetBinaryDir" "$binDir" "libcrypto-1_1-x64.dll"
+ deployBinary "$targetBinaryDir" "$binDir" "libssl-1_1-x64.dll"
+ }
if (Test-Path "$binDir\libcrypto-1_1.dll")
{
deployBinary "$targetBinaryDir" "$binDir" "libcrypto-1_1.dll"