@@ -1,52 +1,53 @@
1−Remove the use of macdeployqt to avoid copying dependencies and
1+diff --git a/CMakeLists.txt b/CMakeLists.txt
2−reduce installation size from 90 MB to 9 MB.
2+index 658548f7..f8f10bdb 100644
3--- a/CMakeLists.txt
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
4+++ b/CMakeLists.txt
5−@@ -250,8 +250,8 @@ else()
5+@@ -288,6 +288,7 @@ if(MINGW)
6− set(PROGNAME keepassxc)
6+ set(PLUGIN_INSTALL_DIR ".")
7− endif()
7+ set(DATA_INSTALL_DIR "share")
8+ elseif(APPLE AND WITH_APP_BUNDLE)
9++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
10+ set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
11+ set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
12+ set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
13+@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON)
9−-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
15+ if(APPLE)
10−- set(CMAKE_INSTALL_PREFIX "/Applications")
16+ set(CMAKE_MACOSX_RPATH TRUE)
11−+if(APPLE AND WITH_APP_BUNDLE)
17+- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
12−+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
18+- if(NOT MACDEPLOYQT_EXE)
13− set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
19+- message(FATAL_ERROR "macdeployqt is required to build in macOS")
21+- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
16−@@ -262,7 +262,7 @@ if(MINGW)
25+ # Debian sets the the build type to None for package builds.
17− set(PLUGIN_INSTALL_DIR ".")
18− set(DATA_INSTALL_DIR "share")
19− elseif(APPLE AND WITH_APP_BUNDLE)
20−- set(CLI_INSTALL_DIR "/usr/local/bin")
21−+ set(CLI_INSTALL_DIR "../bin")
22− set(PROXY_INSTALL_DIR "/usr/local/bin")
23− set(BIN_INSTALL_DIR ".")
24− set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
25diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
26diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
26−index 69526967..38f7c5d4 100644
27+index 110dc606..f9b58818 100644
27--- a/src/CMakeLists.txt
28--- a/src/CMakeLists.txt
28+++ b/src/CMakeLists.txt
29+++ b/src/CMakeLists.txt
29−@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
30+@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE)
30− set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
31+ set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
31− include(CPack)
32+ include(CPack)
33−- add_custom_command(TARGET ${PROGNAME}
34+- add_custom_command(TARGET ${PROGNAME}
34−- POST_BUILD
35+- POST_BUILD
35−- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
36+- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
36−- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
37+- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
37−- COMMENT "Deploying app bundle")
38+- COMMENT "Deploying app bundle")
40 install(TARGETS ${PROGNAME}
41 install(TARGETS ${PROGNAME}
41diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
42diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
42−index 08c53278..b833b692 100644
43+index f1c5387f..abf70b48 100644
43--- a/src/autotype/mac/CMakeLists.txt
44--- a/src/autotype/mac/CMakeLists.txt
44+++ b/src/autotype/mac/CMakeLists.txt
45+++ b/src/autotype/mac/CMakeLists.txt
45−@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE)
46+@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE)
46− add_custom_command(TARGET keepassx-autotype-cocoa
47+ add_custom_command(TARGET keepassx-autotype-cocoa
47− POST_BUILD
48+ POST_BUILD
48− COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
49+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
49−- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
50+- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
50− WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
51+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
51− COMMENT "Deploying autotype plugin")
52+ COMMENT "Deploying autotype plugin")