running test doesn't work currently because of finding qt pluginswip/yesman
parent
fcd769b721
commit
44225ebaf6
@ -1,52 +1,53 @@ |
||||
Remove the use of macdeployqt to avoid copying dependencies and
|
||||
reduce installation size from 90 MB to 9 MB.
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 658548f7..f8f10bdb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -250,8 +250,8 @@ else()
|
||||
set(PROGNAME keepassxc)
|
||||
endif()
|
||||
@@ -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)
|
||||
|
||||
-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")
|
||||
set(CMAKE_INSTALL_MANDIR "/usr/local/share/man")
|
||||
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()
|
||||
endif()
|
||||
|
||||
@@ -262,7 +262,7 @@ if(MINGW)
|
||||
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")
|
||||
set(PROXY_INSTALL_DIR "/usr/local/bin")
|
||||
set(BIN_INSTALL_DIR ".")
|
||||
set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
|
||||
# Debian sets the the build type to None for package builds.
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 69526967..38f7c5d4 100644
|
||||
index 110dc606..f9b58818 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -319,11 +319,6 @@ if(APPLE AND WITH_APP_BUNDLE)
|
||||
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
|
||||
include(CPack)
|
||||
@@ -343,11 +343,6 @@ if(APPLE AND WITH_APP_BUNDLE)
|
||||
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
|
||||
include(CPack)
|
||||
|
||||
- add_custom_command(TARGET ${PROGNAME}
|
||||
- POST_BUILD
|
||||
- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
|
||||
- COMMENT "Deploying app bundle")
|
||||
- add_custom_command(TARGET ${PROGNAME}
|
||||
- POST_BUILD
|
||||
- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
|
||||
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
|
||||
- COMMENT "Deploying app bundle")
|
||||
endif()
|
||||
|
||||
install(TARGETS ${PROGNAME}
|
||||
diff --git a/src/autotype/mac/CMakeLists.txt b/src/autotype/mac/CMakeLists.txt
|
||||
index 08c53278..b833b692 100644
|
||||
index f1c5387f..abf70b48 100644
|
||||
--- a/src/autotype/mac/CMakeLists.txt
|
||||
+++ b/src/autotype/mac/CMakeLists.txt
|
||||
@@ -14,7 +14,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")
|
||||
@@ -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")
|
||||
else()
|
||||
|
Loading…
Reference in new issue