Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-18 03:00:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Include some more Qt plugins in the Mac OS package.

Browse source 
Require at least cmake 2.8.9 for packages which fixes a bug
when using multiple Qt plugins.
This commit is contained in:
Felix Geyer 2012-10-27 10:24:01 +02:00
parent deabb54828
commit 0399feff4d
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/CMakeLists.txt
View file

@ -218,7 +218,7 @@ install(TARGETS ${PROGNAME}
add_subdirectory(autotype) 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") if(QT_MAC_USE_COCOA AND EXISTS "${QT_LIBRARY_DIR}/Resources/qt_menu.nib")
install(DIRECTORY "${QT_LIBRARY_DIR}/Resources/qt_menu.nib" install(DIRECTORY "${QT_LIBRARY_DIR}/Resources/qt_menu.nib"
DESTINATION "${DATA_INSTALL_DIR}") 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_FORMAT "UDBZ")
set(CPACK_DMG_VOLUME_NAME "${PROGNAME}") set(CPACK_DMG_VOLUME_NAME "${PROGNAME}")
set(CPACK_SYSTEM_NAME "OSX") set(CPACK_SYSTEM_NAME "OSX")
set(CPACK_STRIP_FILES ON)
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}") set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}")
include(CPack) include(CPack)
include(DeployQt4) include(DeployQt4)
install_qt4_executable(${PROGNAME}.app "qjpeg") install_qt4_executable(${PROGNAME}.app "qjpeg;qgif;qico;qtaccessiblewidgets")
endif() 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_GENERATOR "ZIP")
set(CPACK_STRIP_FILES ON) set(CPACK_STRIP_FILES ON)
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}") set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}")