2019-04-11 05:13:23 +02:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
index 658548f7..f8f10bdb 100644
|
2017-12-20 06:46:54 +01:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
+++ b/CMakeLists.txt
|
2019-04-11 05:13:23 +02:00
|
|
|
@@ -288,6 +288,7 @@ if(MINGW)
|
|
|
|
set(PLUGIN_INSTALL_DIR ".")
|
|
|
|
set(DATA_INSTALL_DIR "share")
|
|
|
|
elseif(APPLE AND WITH_APP_BUNDLE)
|
|
|
|
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
|
|
|
|
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")
|
|
|
|
@@ -350,12 +351,6 @@ set(CMAKE_AUTORCC ON)
|
2017-12-20 06:46:54 +01:00
|
|
|
|
2019-04-11 05:13:23 +02:00
|
|
|
if(APPLE)
|
|
|
|
set(CMAKE_MACOSX_RPATH TRUE)
|
|
|
|
- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
|
|
|
|
- if(NOT MACDEPLOYQT_EXE)
|
|
|
|
- message(FATAL_ERROR "macdeployqt is required to build in macOS")
|
|
|
|
- else()
|
|
|
|
- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
|
|
|
|
- endif()
|
2017-12-20 06:46:54 +01:00
|
|
|
endif()
|
|
|
|
|
2019-04-11 05:13:23 +02:00
|
|
|
# Debian sets the the build type to None for package builds.
|
2017-12-20 06:46:54 +01:00
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
2019-04-11 05:13:23 +02:00
|
|
|
index 110dc606..f9b58818 100644
|
2017-12-20 06:46:54 +01:00
|
|
|
--- a/src/CMakeLists.txt
|
|
|
|
+++ b/src/CMakeLists.txt
|
2019-04-11 05:13:23 +02:00
|
|
|
@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE)
|
|
|
|
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
|
|
|
|
include(CPack)
|
2018-03-04 06:23:33 +01:00
|
|
|
|
2019-04-11 05:13:23 +02:00
|
|
|
- add_custom_command(TARGET ${PROGNAME}
|
|
|
|
- POST_BUILD
|
|
|
|
- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
|
|
|
|
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
|
|
|
|
- COMMENT "Deploying app bundle")
|
2017-12-20 06:46:54 +01:00
|
|
|
endif()
|
|
|
|
|
2018-03-04 06:23:33 +01:00
|
|
|
install(TARGETS ${PROGNAME}
|
2017-12-20 06:46:54 +01:00
|
|
|
diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
|
2019-04-11 05:13:23 +02:00
|
|
|
index f1c5387f..abf70b48 100644
|
2017-12-20 06:46:54 +01:00
|
|
|
--- a/src/autotype/mac/CMakeLists.txt
|
|
|
|
+++ b/src/autotype/mac/CMakeLists.txt
|
2019-04-11 05:13:23 +02:00
|
|
|
@@ -12,7 +12,6 @@ if(WITH_APP_BUNDLE)
|
|
|
|
add_custom_command(TARGET keepassx-autotype-cocoa
|
|
|
|
POST_BUILD
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
|
|
|
|
- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
|
|
|
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
|
|
|
|
COMMENT "Deploying autotype plugin")
|
2017-12-20 06:46:54 +01:00
|
|
|
else()
|