Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[qt5-base] Move openssl out of core feature (#44553)

This commit is contained in:
Osyotr 2025-03-24 10:56:18 +03:00 committed by GitHub
parent 4c34aeaec3
commit bd5bfe4289
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 64 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,11 @@ if ("mysqlplugin" IN_LIST FEATURES)
set(WITH_MYSQL_PLUGIN ON)
endif()
set(WITH_OPENSSL OFF)
if ("openssl" IN_LIST FEATURES)
set(WITH_OPENSSL ON)
endif()
include(qt_port_functions)
include(configure_qt)
include(install_qt)
@ -111,7 +116,6 @@ list(APPEND CORE_OPTIONS
-system-harfbuzz
-no-angle # Qt does not need to build angle. VCPKG will build angle!
-no-glib
-openssl-linked
-no-feature-gssapi
)
@ -135,6 +139,12 @@ else()
list(APPEND CORE_OPTIONS -no-sql-mysql)
endif()
if(WITH_OPENSSL)
list(APPEND CORE_OPTIONS -openssl-linked)
else()
list(APPEND CORE_OPTIONS -no-openssl)
endif()
if ("vulkan" IN_LIST FEATURES)
list(APPEND CORE_OPTIONS --vulkan=yes)
else()
@ -167,7 +177,7 @@ find_library(DOUBLECONVERSION_RELEASE NAMES double-conversion PATHS "${CURRENT_I
find_library(DOUBLECONVERSION_DEBUG NAMES double-conversion PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(HARFBUZZ_RELEASE NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(HARFBUZZ_DEBUG NAMES harfbuzz PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux)
find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(SQLITE_DEBUG NAMES sqlite3 sqlite3d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(BROTLI_COMMON_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
@ -270,14 +280,18 @@ if(VCPKG_TARGET_IS_WINDOWS)
list(APPEND RELEASE_OPTIONS
"SQLITE_LIBS=${SQLITE_RELEASE}"
"HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}"
"OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} ${ADDITIONAL_WINDOWS_LIBS}"
)
list(APPEND DEBUG_OPTIONS
"SQLITE_LIBS=${SQLITE_DEBUG}"
"HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_DEBUG}"
"OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS}"
)
if(WITH_OPENSSL)
list(APPEND RELEASE_OPTIONS "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} ${ADDITIONAL_WINDOWS_LIBS}")
list(APPEND DEBUG_OPTIONS "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS}")
endif()
if(WITH_PGSQL_PLUGIN)
list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} ${ADDITIONAL_WINDOWS_LIBS} -lwldap32")
list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} ${ADDITIONAL_WINDOWS_LIBS} -lwldap32")
@ -287,15 +301,19 @@ elseif(VCPKG_TARGET_IS_LINUX)
list(APPEND RELEASE_OPTIONS
"SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread"
"HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}"
"OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread"
"FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -luuid"
)
list(APPEND DEBUG_OPTIONS
"SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread"
"HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_DEBUG}"
"OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread"
"FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -luuid"
)
if(WITH_OPENSSL)
list(APPEND RELEASE_OPTIONS "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread")
list(APPEND DEBUG_OPTIONS "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread")
endif()
if(WITH_PGSQL_PLUGIN)
list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_TYPES_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread")
list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_TYPES_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread")
@ -366,16 +384,19 @@ elseif(VCPKG_TARGET_IS_OSX)
list(APPEND RELEASE_OPTIONS
"SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread"
"HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE} -framework ApplicationServices"
"OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread"
"FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -liconv"
)
list(APPEND DEBUG_OPTIONS
"SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread"
"HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_DEBUG} -framework ApplicationServices"
"OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread"
"FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -liconv"
)
if(WITH_OPENSSL)
list(APPEND RELEASE_OPTIONS "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread")
list(APPEND DEBUG_OPTIONS "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread")
endif()
if(WITH_PGSQL_PLUGIN)
list(APPEND RELEASE_OPTIONS "PSQL_LIBS=${PSQL_RELEASE} ${PSQL_PORT_RELEASE} ${PSQL_TYPES_RELEASE} ${PSQL_COMMON_RELEASE} ${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread")
list(APPEND DEBUG_OPTIONS "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_TYPES_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread")

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

@ -1,6 +1,7 @@
{
"name": "qt5-base",
"version": "5.15.16",
"port-version": 1,
"description": "Qt Base provides the basic non-GUI functionality required by all Qt applications.",
"homepage": "https://www.qt.io/",
"license": null,
@ -27,7 +28,6 @@
"name": "opengl",
"platform": "!windows"
},
"openssl",
{
"name": "pcre2",
"default-features": false
@ -49,6 +49,9 @@
"zlib",
"zstd"
],
"default-features": [
"openssl"
],
"features": {
"icu": {
"description": "Enable ICU support",
@ -68,6 +71,12 @@
"libmysql"
]
},
"openssl": {
"description": "Build with OpenSSL support",
"dependencies": [
"openssl"
]
},
"postgresqlplugin": {
"description": "Build the sql plugin for connecting to postgresql databases",
"dependencies": [

7
ports/qt5-webengine/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "qt5-webengine",
"version": "5.15.16",
"port-version": 2,
"port-version": 3,
"description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
"license": null,
"supports": "!static",
@ -25,7 +25,10 @@
},
{
"name": "qt5-base",
"default-features": false
"default-features": false,
"features": [
"openssl"
]
},
"qt5-declarative",
"qt5-location",

2
ports/qt5/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "qt5",
"version": "5.15.16",
"port-version": 1,
"description": "A cross-platform application and UI framework.",
"homepage": "https://www.qt.io/",
"license": null,
@ -93,6 +94,7 @@
"features": [
"icu",
"mysqlplugin",
"openssl",
"postgresqlplugin"
]
}

6
versions/baseline.json
View File

@ -7510,7 +7510,7 @@
},
"qt5": {
"baseline": "5.15.16",
"port-version": 0
"port-version": 1
},
"qt5-3d": {
"baseline": "5.15.16",
@ -7526,7 +7526,7 @@
},
"qt5-base": {
"baseline": "5.15.16",
"port-version": 0
"port-version": 1
},
"qt5-canvas3d": {
"baseline": "0",
@ -7654,7 +7654,7 @@
},
"qt5-webengine": {
"baseline": "5.15.16",
"port-version": 2
"port-version": 3
},
"qt5-webglplugin": {
"baseline": "5.15.16",

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

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cac42b24892188dea98c40845f2437c8f6d5f4e3",
"version": "5.15.16",
"port-version": 1
},
{
"git-tree": "d207be89c93ec616752e5a19f97c2d794f117779",
"version": "5.15.16",

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

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "477c867612027fd5469b5279a37f4d22969bfdfd",
"version": "5.15.16",
"port-version": 3
},
{
"git-tree": "7785e40d08d000118d180514d7e5f5f30a75ada8",
"version": "5.15.16",

5
versions/q-/qt5.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "544f7aa5b583b45b1900d0b775d06920257b0634",
"version": "5.15.16",
"port-version": 1
},
{
"git-tree": "80a421310ef4e6e2e5f7b54a40bd90df895d82d8",
"version": "5.15.16",