X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/565bd3bf23dfb9b139de089d3c4f8b57e124f7ee..caf017c2fefa8280046b02cfd071a118f2909ced:/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fb5a88413..0340a9856 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,6 +31,7 @@ set(dolphinprivate_LIB_SRCS dolphinviewactionhandler.cpp dolphinviewautoscroller.cpp dolphinremoteencoding.cpp + dolphindetailsviewexpander.cpp draganddrophelper.cpp folderexpander.cpp renamedialog.cpp @@ -41,43 +42,30 @@ set(dolphinprivate_LIB_SRCS settings/dolphinsettings.cpp settings/viewpropertiesdialog.cpp settings/viewpropsprogressinfo.cpp - panels/information/kmetadatawidget.cpp - panels/information/kmetadataconfigurationdialog.cpp tooltips/ktooltip.cpp tooltips/ktooltipwindow.cpp tooltips/tooltipmanager.cpp - versioncontrolobserver.cpp + versioncontrol/updateitemstatesthread.cpp + versioncontrol/versioncontrolobserver.cpp viewextensionsfactory.cpp viewproperties.cpp zoomlevelinfo.cpp - ) - -if(Nepomuk_FOUND) -set(dolphinprivate_LIB_SRCS - ${dolphinprivate_LIB_SRCS} - panels/information/kcommentwidget.cpp - panels/information/kedittagsdialog.cpp - panels/information/kloadmetadatathread.cpp - panels/information/nepomukmassupdatejob.cpp - panels/information/ktaggingwidget.cpp ) -endif(Nepomuk_FOUND) kde4_add_kcfg_files(dolphinprivate_LIB_SRCS settings/dolphin_columnmodesettings.kcfgc settings/dolphin_directoryviewpropertysettings.kcfgc settings/dolphin_detailsmodesettings.kcfgc settings/dolphin_iconsmodesettings.kcfgc - settings/dolphin_generalsettings.kcfgc) + settings/dolphin_generalsettings.kcfgc + settings/dolphin_versioncontrolsettings.kcfgc +) kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS}) -target_link_libraries(dolphinprivate ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES}) -if(X11_Xrender_FOUND) - target_link_libraries(dolphinprivate ${X11_Xrender_LIB} ) -endif(X11_Xrender_FOUND) +target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS} ${QIMAGEBLITZ_LIBRARIES}) if (Nepomuk_FOUND) - target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES}) + target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${NEPOMUK_QUERY_LIBRARIES} ${SOPRANO_LIBRARIES}) endif (Nepomuk_FOUND) @@ -92,21 +80,22 @@ set(dolphinpart_SRCS ) set(fileviewsvnplugin_SRCS - fileviewsvnplugin.cpp + versioncontrol/fileviewsvnplugin.cpp ) kde4_add_plugin(dolphinpart ${dolphinpart_SRCS}) kde4_add_plugin(fileviewsvnplugin ${fileviewsvnplugin_SRCS}) -target_link_libraries(dolphinpart dolphinprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS}) -target_link_libraries(fileviewsvnplugin ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${KDE4_KIO_LIBS} konq) +target_link_libraries(dolphinpart dolphinprivate konq ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS}) +target_link_libraries(fileviewsvnplugin ${KDE4_KIO_LIBS} konq) install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS fileviewsvnplugin DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart) install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install(FILES fileviewsvnplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES versioncontrol/fileviewsvnplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) ########################################## @@ -122,8 +111,6 @@ set(dolphin_SRCS pixmapviewer.cpp panels/information/informationpanel.cpp panels/information/informationpanelcontent.cpp - panels/information/kmetadatawidget.cpp - panels/information/kmetadataconfigurationdialog.cpp panels/information/phononwidget.cpp panels/folders/ktreeview.cpp panels/places/placespanel.cpp @@ -132,10 +119,7 @@ set(dolphin_SRCS panels/folders/folderspanel.cpp panels/folders/paneltreeview.cpp search/dolphinsearchbox.cpp - search/dolphinsearchoptionsconfigurator.cpp - search/searchcriteriondescription.cpp - search/searchcriterionselector.cpp - search/searchcriterionvalue.cpp + search/searchoptiondialogbox.cpp settings/behaviorsettingspage.cpp settings/columnviewsettingspage.cpp settings/contextmenusettingspage.cpp @@ -158,21 +142,28 @@ set(dolphin_SRCS statusbar/statusbarspaceinfo.cpp statusbar/statusbarmessagelabel.cpp zoomlevelinfo.cpp - ) +) kde4_add_kcfg_files(dolphin_SRCS panels/folders/dolphin_folderspanelsettings.kcfgc - panels/information/dolphin_informationpanelsettings.kcfgc) + panels/information/dolphin_informationpanelsettings.kcfgc + search/dolphin_searchsettings.kcfgc +) if(Nepomuk_FOUND) -set(dolphin_SRCS - ${dolphin_SRCS} - panels/information/kcommentwidget.cpp - panels/information/kedittagsdialog.cpp - panels/information/kloadmetadatathread.cpp - panels/information/nepomukmassupdatejob.cpp - panels/information/ktaggingwidget.cpp -) + set(dolphin_SRCS + ${dolphin_SRCS} + search/dolphinsearchoptionsconfigurator.cpp + search/searchcriteriondescription.cpp + search/searchcriterionselector.cpp + search/searchcriterionvalue.cpp + ) +endif(Nepomuk_FOUND) + +if(Nepomuk_FOUND) + include(SopranoAddOntology) + soprano_add_ontology(dolphin_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig "NFO" "Nepomuk::Vocabulary" "trig") + soprano_add_ontology(dolphin_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig "NIE" "Nepomuk::Vocabulary" "trig") endif(Nepomuk_FOUND) if(NOT WIN32) @@ -188,27 +179,40 @@ qt4_add_dbus_adaptor(dolphin_SRCS kde4_add_app_icon(dolphin_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/system-file-manager.png") -kde4_add_executable(dolphin ${dolphin_SRCS}) +kde4_add_kdeinit_executable(dolphin ${dolphin_SRCS}) -target_link_libraries(dolphin ${KDE4_KIO_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KUTILS_LIBRARY} konq dolphinprivate ${KDE4_PHONON_LIBS}) +target_link_libraries(kdeinit_dolphin + ${KDE4_KDEPRINT_LIBS} + ${KDE4_KFILE_LIBS} + ${KDE4_KUTILS_LIBRARY} + konq + dolphinprivate + knewstuff3 + ${KDE4_PHONON_LIBS} +) if (Nepomuk_FOUND) - target_link_libraries(dolphin ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES}) + target_link_libraries(kdeinit_dolphin + ${NEPOMUK_LIBRARIES} + ${SOPRANO_LIBRARIES} + ${NEPOMUK_QUERY_LIBRARIES} + ) endif (Nepomuk_FOUND) +install(TARGETS kdeinit_dolphin ${INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS}) ########################################## set(kcm_dolphinviewmodes_PART_SRCS kcm/kcmdolphinviewmodes.cpp + pixmapviewer.cpp settings/columnviewsettingspage.cpp settings/detailsviewsettingspage.cpp settings/dolphinfontrequester.cpp settings/iconsizegroupbox.cpp settings/iconsviewsettingspage.cpp settings/viewsettingspagebase.cpp - pixmapviewer.cpp zoomlevelinfo.cpp) set(kcm_dolphinnavigation_PART_SRCS @@ -233,7 +237,9 @@ kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS settings/dolphin_directoryviewpropertysettings.kcfgc settings/dolphin_detailsmodesettings.kcfgc settings/dolphin_iconsmodesettings.kcfgc - settings/dolphin_generalsettings.kcfgc) + settings/dolphin_generalsettings.kcfgc + settings/dolphin_versioncontrolsettings.kcfgc +) kde4_add_kcfg_files(kcm_dolphinnavigation_PART_SRCS settings/dolphin_generalsettings.kcfgc) @@ -251,8 +257,8 @@ kde4_add_plugin(kcm_dolphingeneral ${kcm_dolphingeneral_PART_SRCS}) target_link_libraries(kcm_dolphinviewmodes ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate) target_link_libraries(kcm_dolphinnavigation ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate) -target_link_libraries(kcm_dolphinservices ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate) -target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate) +target_link_libraries(kcm_dolphinservices ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} dolphinprivate) +target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate) if (Nepomuk_FOUND) target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_LIBRARIES}) target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_LIBRARIES}) @@ -267,11 +273,20 @@ install(TARGETS kcm_dolphingeneral DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### -install( FILES dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES settings/dolphin_directoryviewpropertysettings.kcfg settings/dolphin_generalsettings.kcfg settings/dolphin_columnmodesettings.kcfg settings/dolphin_iconsmodesettings.kcfg settings/dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin ) -install( FILES search/dolphinsearchcommands.desktop DESTINATION ${DATA_INSTALL_DIR}/dolphin ) +install( FILES dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES settings/dolphin_directoryviewpropertysettings.kcfg + settings/dolphin_generalsettings.kcfg + settings/dolphin_columnmodesettings.kcfg + settings/dolphin_iconsmodesettings.kcfg + settings/dolphin_detailsmodesettings.kcfg + settings/dolphin_versioncontrolsettings.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) +install( FILES dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin ) +install( FILES search/dolphinsearchcommands.desktop DESTINATION ${DATA_INSTALL_DIR}/dolphin ) install( FILES kcm/kcmdolphinviewmodes.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES khns/servicemenu.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( PROGRAMS khns/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} ) +install( PROGRAMS khns/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )