Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 575) +++ CMakeLists.txt (working copy) @@ -94,11 +94,10 @@ ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KHTML_LIBS} - QtCore - QtGui - QtXml ${CLUCENE_LIBRARY} ${SWORD_LIBRARY} + -licucore + -lcurl ) ###################################################### @@ -109,18 +108,22 @@ # main binary INSTALL(TARGETS "bibletime" DESTINATION "bin/") # compiled catalogs +IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + SET(BT_SHARE_DESTINATION_PREFIX "bin/bibletime.app/Contents/") +ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + FOREACH(_INSTALL_LOCALE_LANG ${INSTALL_LOCALE_LANGS}) INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/i18n/messages/${_INSTALL_LOCALE_LANG}.qm" - DESTINATION "share/bibletime/locale/") + DESTINATION "${BT_SHARE_DESTINATION_PREFIX}share/bibletime/locale/") ENDFOREACH(_INSTALL_LOCALE_LANG) # icons FILE(GLOB BT_INSTALL_ICONS_LIST ${CMAKE_CURRENT_SOURCE_DIR}/pics/icons/*.svg) -INSTALL(FILES ${BT_INSTALL_ICONS_LIST} DESTINATION "share/bibletime/icons/") +INSTALL(FILES ${BT_INSTALL_ICONS_LIST} DESTINATION "${BT_SHARE_DESTINATION_PREFIX}share/bibletime/icons/") # display templates FILE(GLOB BT_INSTALL_DISPLAY_TEMPLATES_LIST ${CMAKE_CURRENT_SOURCE_DIR}/src/display-templates/*.tmpl) -INSTALL(FILES ${BT_INSTALL_DISPLAY_TEMPLATES_LIST} DESTINATION "share/bibletime/display-templates/") +INSTALL(FILES ${BT_INSTALL_DISPLAY_TEMPLATES_LIST} DESTINATION "${BT_SHARE_DESTINATION_PREFIX}share/bibletime/display-templates/") # splash screen -INSTALL(FILES "pics/startuplogo.png" DESTINATION "share/bibletime/pics/") +INSTALL(FILES "pics/startuplogo.png" DESTINATION "${BT_SHARE_DESTINATION_PREFIX}share/bibletime/pics/") ######################################################