mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-11-20 00:51:32 -08:00
Ensure Qt's TLS plugins are deployed on macOS
For whatever reason, macdeployqt does not deploy the TLS plugins on its own. We need to find them manually. Fixes #13855
This commit is contained in:
1 parent
2e884edf7b
commit
09e34ba86c
3 files changed
+19
-1
No files matched your search
@@ -8,6 +8,7 @@ function(kpxc_run_macdeployqt_at_install_time)
|
||||
set(NO_VALUE_OPTIONS)
|
||||
set(SINGLE_VALUE_OPTIONS
|
||||
APP_NAME
|
||||
TLS_PLUGIN_DIR
|
||||
)
|
||||
set(MULTI_VALUE_OPTIONS
|
||||
EXTRA_BINARIES
|
||||
@@ -48,6 +49,11 @@ function(kpxc_run_macdeployqt_at_install_time)
|
||||
|
||||
install(CODE
|
||||
"
|
||||
if(IS_DIRECTORY \"${ARG_TLS_PLUGIN_DIR}\")
|
||||
file(COPY \"${ARG_TLS_PLUGIN_DIR}/\"
|
||||
DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${APP_BUNDLE_NAME}/Contents/PlugIns/tls\")
|
||||
endif()
|
||||
|
||||
execute_process(
|
||||
COMMAND ${COMMAND_ARGS}
|
||||
${COMMAND_ECHO}
|
||||
|
||||
@@ -6,8 +6,17 @@ if(APPLE AND WITH_APP_BUNDLE)
|
||||
# _MACDEPLOYQT_EXTRA_BINARIES global property.
|
||||
# All install(TARGETS) calls should have already been called.
|
||||
get_property(MACDEPLOYQT_EXTRA_BINARIES GLOBAL PROPERTY _MACDEPLOYQT_EXTRA_BINARIES)
|
||||
find_path(QT_TLS_PLUGIN_DIR
|
||||
NAMES libqopensslbackend.dylib libqsecuretransportbackend.dylib
|
||||
HINTS "${Qt6_PREFIX}"
|
||||
PATH_SUFFIXES
|
||||
plugins/tls
|
||||
Qt6/plugins/tls
|
||||
qt/plugins/tls
|
||||
)
|
||||
kpxc_run_macdeployqt_at_install_time(
|
||||
APP_NAME "${PROGNAME}"
|
||||
TLS_PLUGIN_DIR "${QT_TLS_PLUGIN_DIR}"
|
||||
EXTRA_BINARIES ${MACDEPLOYQT_EXTRA_BINARIES}
|
||||
)
|
||||
endif()
|
||||
+4
-1
@@ -29,7 +29,10 @@
|
||||
"qt": {
|
||||
"description": "Build Qt6 dependency.",
|
||||
"dependencies": [
|
||||
"qtbase",
|
||||
{
|
||||
"name": "qtbase",
|
||||
"features": ["network", "openssl"]
|
||||
},
|
||||
{
|
||||
"name": "qtbase",
|
||||
"platform": "linux | freebsd",
|
||||
|
||||
Reference in new issue
Block a user