2017-12-20 05:46:54 +00:00
|
|
|
Remove the use of macdeployqt to avoid copying dependencies and
|
|
|
|
|
reduce installation size from 90 MB to 9 MB.
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
2018-03-04 05:23:33 +00:00
|
|
|
@@ -250,8 +250,8 @@ else()
|
2017-12-20 05:46:54 +00:00
|
|
|
set(PROGNAME keepassxc)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
-if(APPLE AND WITH_APP_BUNDLE AND "${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
|
|
|
|
|
- set(CMAKE_INSTALL_PREFIX "/Applications")
|
|
|
|
|
+if(APPLE AND WITH_APP_BUNDLE)
|
|
|
|
|
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications")
|
2018-03-04 05:23:33 +00:00
|
|
|
set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
|
2017-12-20 05:46:54 +00:00
|
|
|
endif()
|
|
|
|
|
|
2018-03-04 05:23:33 +00:00
|
|
|
@@ -262,7 +262,7 @@ if(MINGW)
|
2017-12-20 05:46:54 +00:00
|
|
|
set(PLUGIN_INSTALL_DIR ".")
|
|
|
|
|
set(DATA_INSTALL_DIR "share")
|
|
|
|
|
elseif(APPLE AND WITH_APP_BUNDLE)
|
|
|
|
|
- set(CLI_INSTALL_DIR "/usr/local/bin")
|
|
|
|
|
+ set(CLI_INSTALL_DIR "../bin")
|
2018-03-04 05:23:33 +00:00
|
|
|
set(PROXY_INSTALL_DIR "/usr/local/bin")
|
2017-12-20 05:46:54 +00:00
|
|
|
set(BIN_INSTALL_DIR ".")
|
|
|
|
|
set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
|
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
2018-03-04 05:23:33 +00:00
|
|
|
index 69526967..38f7c5d4 100644
|
2017-12-20 05:46:54 +00:00
|
|
|
--- a/src/CMakeLists.txt
|
|
|
|
|
+++ b/src/CMakeLists.txt
|
2018-03-04 05:23:33 +00:00
|
|
|
@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
|
|
|
|
|
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
|
|
|
|
|
include(CPack)
|
|
|
|
|
|
2017-12-20 05:46:54 +00:00
|
|
|
- add_custom_command(TARGET ${PROGNAME}
|
|
|
|
|
- POST_BUILD
|
2018-03-04 05:23:33 +00:00
|
|
|
- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
|
2017-12-20 05:46:54 +00:00
|
|
|
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
|
|
|
|
|
- COMMENT "Deploying app bundle")
|
|
|
|
|
endif()
|
|
|
|
|
|
2018-03-04 05:23:33 +00:00
|
|
|
install(TARGETS ${PROGNAME}
|
2017-12-20 05:46:54 +00:00
|
|
|
diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
|
2018-03-04 05:23:33 +00:00
|
|
|
index 08c53278..b833b692 100644
|
2017-12-20 05:46:54 +00:00
|
|
|
--- a/src/autotype/mac/CMakeLists.txt
|
|
|
|
|
+++ b/src/autotype/mac/CMakeLists.txt
|
2018-03-04 05:23:33 +00:00
|
|
|
@@ -14,7 +14,6 @@ if(WITH_APP_BUNDLE)
|
2017-12-20 05:46:54 +00:00
|
|
|
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}
|
2018-03-04 05:23:33 +00:00
|
|
|
- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
|
2017-12-20 05:46:54 +00:00
|
|
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
|
|
|
|
|
COMMENT "Deploying autotype plugin")
|
|
|
|
|
else()
|
