Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanek Bevendorff <janek@jbev.net>2020-03-25 02:24:27 +0300
committerJanek Bevendorff <janek@jbev.net>2020-04-09 17:22:42 +0300
commite9754efbbe2f6da03b29d42606cb5365e4cd489e (patch)
treef0cd86eda8756f550280a2e774824f80570c7237 /CMakeLists.txt
parentf8c962bd253ab4d5c0ce2fe7029688057e50a778 (diff)
Fix macOS 10.15.4 codesigning crash.
The recent macOS security patch renders our codesigning "fix" of setting the sandbox entitlement to false twice unusable. This patch adds a full provisioning profile and adjusts the signing procedure to not include entitlements for Qt frameworks. The patch also changes the app and bundle ID, so granted accessibility privileges have to be granted again after installing the update. Fixes #4398 Fixes #4515
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac4c8a9ac..8375dff7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -334,12 +334,13 @@ if(MINGW)
set(PLUGIN_INSTALL_DIR ".")
set(DATA_INSTALL_DIR "share")
elseif(APPLE AND WITH_APP_BUNDLE)
- set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
- set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
- set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
- set(BIN_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
- set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
- set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources")
+ set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
+ set(CMAKE_INSTALL_MANDIR "${BUNDLE_INSTALL_DIR}/Resources/man")
+ set(CLI_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
+ set(PROXY_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
+ set(BIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
+ set(PLUGIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/PlugIns")
+ set(DATA_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/Resources")
else()
include(GNUInstallDirs)