pyrox.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 74b1a7ff..0a713a32 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -307,6 +307,7 @@ if(MINGW)
6 set(PLUGIN_INSTALL_DIR ".")
7 set(DATA_INSTALL_DIR "share")
8 elseif(APPLE AND WITH_APP_BUNDLE)
9+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
10 set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
11 set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
12 set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
13@@ -369,12 +370,6 @@ set(CMAKE_AUTORCC ON)
14
15 if(APPLE)
16 set(CMAKE_MACOSX_RPATH TRUE)
17- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
18- if(NOT MACDEPLOYQT_EXE)
19- message(FATAL_ERROR "macdeployqt is required to build on macOS")
20- else()
21- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
22- endif()
23 elseif(MINGW)
24 find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
25 if(NOT WINDEPLOYQT_EXE)
26diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
27index f142f368..0742512d 100644
28--- a/src/CMakeLists.txt
29+++ b/src/CMakeLists.txt
30@@ -351,11 +351,6 @@ if(APPLE AND WITH_APP_BUNDLE)
31 set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
32 include(CPack)
33
34- add_custom_command(TARGET ${PROGNAME}
35- POST_BUILD
36- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
37- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
38- COMMENT "Deploying app bundle")
39 endif()
40
41 install(TARGETS ${PROGNAME}
42diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
43index 7427450a..a0a58d71 100644
44--- a/src/autotype/mac/CMakeLists.txt
45+++ b/src/autotype/mac/CMakeLists.txt
46@@ -8,7 +8,6 @@ if(WITH_APP_BUNDLE)
47 add_custom_command(TARGET keepassx-autotype-cocoa
48 POST_BUILD
49 COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
50- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
51 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
52 COMMENT "Deploying autotype plugin")
53 else()