From 0399feff4d09bf08a3187175a24772b37ab78bd0 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sat, 27 Oct 2012 10:24:01 +0200 Subject: [PATCH] Include some more Qt plugins in the Mac OS package. Require at least cmake 2.8.9 for packages which fixes a bug when using multiple Qt plugins. --- src/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 35ed1a2a7..361001a45 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -218,7 +218,7 @@ install(TARGETS ${PROGNAME} add_subdirectory(autotype) -if(APPLE AND NOT (${CMAKE_VERSION} VERSION_LESS 2.8.8)) +if(APPLE AND NOT (${CMAKE_VERSION} VERSION_LESS 2.8.9)) if(QT_MAC_USE_COCOA AND EXISTS "${QT_LIBRARY_DIR}/Resources/qt_menu.nib") install(DIRECTORY "${QT_LIBRARY_DIR}/Resources/qt_menu.nib" DESTINATION "${DATA_INSTALL_DIR}") @@ -228,14 +228,15 @@ if(APPLE AND NOT (${CMAKE_VERSION} VERSION_LESS 2.8.8)) set(CPACK_DMG_FORMAT "UDBZ") set(CPACK_DMG_VOLUME_NAME "${PROGNAME}") set(CPACK_SYSTEM_NAME "OSX") + set(CPACK_STRIP_FILES ON) set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}") include(CPack) include(DeployQt4) - install_qt4_executable(${PROGNAME}.app "qjpeg") + install_qt4_executable(${PROGNAME}.app "qjpeg;qgif;qico;qtaccessiblewidgets") endif() -if(MINGW AND NOT (${CMAKE_VERSION} VERSION_LESS 2.8.8)) +if(MINGW AND NOT (${CMAKE_VERSION} VERSION_LESS 2.8.9)) set(CPACK_GENERATOR "ZIP") set(CPACK_STRIP_FILES ON) set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}")