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

[qt5-base]: Fix build with "mysqlplugin" feature by linking to OpenSSL and zlib (#24462)

Browse Source 
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
This commit is contained in:
Davide Beatrici 2022-04-29 22:21:34 +02:00 committed by GitHub
parent 64d550b430
commit 2ece8fedb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,8 +279,8 @@ if(VCPKG_TARGET_IS_WINDOWS)
list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib")
endif()
if (WITH_MYSQL_PLUGIN)
list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE}")
list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG}")
list(APPEND RELEASE_OPTIONS "MYSQL_LIBS=${MYSQL_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ZLIB_RELEASE} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib")
list(APPEND DEBUG_OPTIONS "MYSQL_LIBS=${MYSQL_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ZLIB_DEBUG} ws2_32.lib secur32.lib advapi32.lib shell32.lib crypt32.lib user32.lib gdi32.lib")
endif(WITH_MYSQL_PLUGIN)
elseif(VCPKG_TARGET_IS_LINUX)

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

@ -1,7 +1,7 @@
{
"name": "qt5-base",
"version": "5.15.3",
"port-version": 2,
"port-version": 3,
"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

@ -5690,7 +5690,7 @@
},
"qt5-base": {
"baseline": "5.15.3",
"port-version": 2
"port-version": 3
},
"qt5-canvas3d": {
"baseline": "0",

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

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7518c5eeb84d3bbfaaa88cb19795b693fd0923f7",
"version": "5.15.3",
"port-version": 3
},
{
"git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931",
"version": "5.15.3",