pyrox.dev
1Remove the use of macdeployqt to avoid copying dependencies and
2reduce installation size from 90 MB to 9 MB.
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -250,8 +250,8 @@ else()
6 set(PROGNAME keepassxc)
7 endif()
8
9-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
10- set(CMAKE_INSTALL_PREFIX "/Applications")
11+if(APPLE AND WITH_APP_BUNDLE)
12+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
13 set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
14 endif()
15
16@@ -262,7 +262,7 @@ if(MINGW)
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
26index 69526967..38f7c5d4 100644
27--- a/src/CMakeLists.txt
28+++ b/src/CMakeLists.txt
29@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
30 set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
31 include(CPack)
32
33- add_custom_command(TARGET ${PROGNAME}
34- POST_BUILD
35- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
36- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
37- COMMENT "Deploying app bundle")
38 endif()
39
40 install(TARGETS ${PROGNAME}
41diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
42index 08c53278..b833b692 100644
43--- a/src/autotype/mac/CMakeLists.txt
44+++ b/src/autotype/mac/CMakeLists.txt
45@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE)
46 add_custom_command(TARGET keepassx-autotype-cocoa
47 POST_BUILD
48 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 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
51 COMMENT "Deploying autotype plugin")
52 else()