Merge branch 'Applications/16.04'

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 523ee03a96a44570ff0321f8a48b067127ced9df..069096814d5e0ce88aac8ad405755a839c5c4d49 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,15 +3,52 @@ configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
 
 configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
 
 
 configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
 

-add_definitions(-DTRANSLATION_DOMAIN=\"dolphin\")
-add_definitions(-Wno-deprecated-declarations)
-remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_URL_CAST_FROM_STRING)
+add_definitions(
+    -DTRANSLATION_DOMAIN=\"dolphin\"
+    -DQT_USE_FAST_CONCATENATION
+    -DQT_USE_FAST_OPERATOR_PLUS
+)
+remove_definitions(
+    -DQT_NO_CAST_FROM_BYTEARRAY
+    -DQT_NO_URL_CAST_FROM_STRING
+    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
+    -DQT_NO_CAST_FROM_ASCII
+    -DQT_NO_CAST_TO_ASCII
+)

 
 

-if(X11_Xrender_FOUND)
-    set(HAVE_XRENDER TRUE)
-endif()
+##########################################
+
+set(dolphinvcs_LIB_SRCS
+    views/versioncontrol/kversioncontrolplugin.cpp
+)
+
+add_library(dolphinvcs ${dolphinvcs_LIB_SRCS})
+generate_export_header(dolphinvcs BASE_NAME dolphinvcs)
+
+target_link_libraries(
+    dolphinvcs PUBLIC
+    Qt5::Widgets
+)
+
+set_target_properties(dolphinvcs PROPERTIES
+    VERSION ${DOLPHINVCS_VERSION_STRING}
+    SOVERSION ${DOLPHINVCS_SOVERSION}
+    EXPORT_NAME DolphinVcs
+)
+
+ecm_generate_headers(dolphinvcs_LIB_HEADERS
+    HEADER_NAMES
+    KVersionControlPlugin
+
+    RELATIVE "views/versioncontrol"
+    REQUIRED_HEADERS dolphinvcs_LIB_HEADERS
+)
+
+install(TARGETS dolphinvcs EXPORT DolphinVcsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

 
 

-configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
+install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
+install(FILES ${dolphinvcs_LIB_HEADERS} DESTINATION "${KDE_INSTALL_INCLUDEDIR}/Dolphin" COMPONENT Devel)

 
 ########### next target ###############
 
 
 ########### next target ###############
 


@@ -73,6 +110,7 @@ set(dolphinprivate_LIB_SRCS
     views/zoomlevelinfo.cpp
     dolphinremoveaction.cpp
     dolphinnewfilemenu.cpp
     views/zoomlevelinfo.cpp
     dolphinremoveaction.cpp
     dolphinnewfilemenu.cpp

+    dolphindebug.cpp

 )
 
 if(HAVE_BALOO)
 )
 
 if(HAVE_BALOO)


@@ -82,7 +120,7 @@ if(HAVE_BALOO)
     )
 endif()
 
     )
 endif()
 

-kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS
+kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS GENERATE_MOC

     settings/dolphin_compactmodesettings.kcfgc
     settings/dolphin_directoryviewpropertysettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc
     settings/dolphin_compactmodesettings.kcfgc
     settings/dolphin_directoryviewpropertysettings.kcfgc
     settings/dolphin_detailsmodesettings.kcfgc


@@ -92,12 +130,24 @@ kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS
 )
 
 add_library(dolphinprivate ${dolphinprivate_LIB_SRCS})
 )
 
 add_library(dolphinprivate ${dolphinprivate_LIB_SRCS})

+generate_export_header(dolphinprivate BASE_NAME dolphin)

 
 target_link_libraries(
     dolphinprivate PUBLIC
 
 target_link_libraries(
     dolphinprivate PUBLIC

-    KF5::KDELibs4Support
-    KF5::Konq
+    dolphinvcs
+    Qt5::Gui
+    KF5::Crash
+    KF5::I18n
+    KF5::IconThemes
+    KF5::KIOCore
+    KF5::KIOWidgets
+    KF5::KIOFileWidgets
+    KF5::Completion
+    KF5::TextWidgets
+    KF5::WindowSystem
+    KF5::ConfigCore

     KF5::NewStuff
     KF5::NewStuff

+    KF5::Parts

 )
 
 if(HAVE_BALOO)
 )
 
 if(HAVE_BALOO)


@@ -105,47 +155,45 @@ if(HAVE_BALOO)
         dolphinprivate PUBLIC
         KF5::FileMetaData
         KF5::Baloo
         dolphinprivate PUBLIC
         KF5::FileMetaData
         KF5::Baloo

-        KF5::BalooNaturalQueryParser

         KF5::BalooWidgets
     )
         KF5::BalooWidgets
     )

+else()
+    target_link_libraries(
+        dolphinprivate PUBLIC
+        KF5::KDELibs4Support # for KFileMetaDataWidget
+    )

 endif()
 
 endif()
 

-if(X11_Xrender_FOUND)
-    target_link_libraries(dolphinprivate ${X11_Xrender_LIB})
-endif(X11_Xrender_FOUND)
-

 set_target_properties(dolphinprivate PROPERTIES
     VERSION ${DOLPHINPRIVATE_VERSION_STRING}
     SOVERSION ${DOLPHINPRIVATE_SOVERSION}
 )
 
 set_target_properties(dolphinprivate PROPERTIES
     VERSION ${DOLPHINPRIVATE_VERSION_STRING}
     SOVERSION ${DOLPHINPRIVATE_SOVERSION}
 )
 

-install(TARGETS dolphinprivate ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS dolphinprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)

 
 ##########################################
 
 set(dolphinpart_SRCS
    dolphinpart.cpp
    dolphinpart_ext.cpp
 
 ##########################################
 
 set(dolphinpart_SRCS
    dolphinpart.cpp
    dolphinpart_ext.cpp

+   dolphindebug.cpp

 )
 
 add_library(dolphinpart MODULE ${dolphinpart_SRCS})
 
 target_link_libraries(dolphinpart
     dolphinprivate
 )
 
 add_library(dolphinpart MODULE ${dolphinpart_SRCS})
 
 target_link_libraries(dolphinpart
     dolphinprivate

-    KF5::Konq
-    KF5::KDELibs4Support

 )
 
 )
 

-install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR})

 
 

-install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart)
-install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+install(FILES dolphinpart.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphinpart)
+install(FILES dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})

 
 ##########################################
 
 set(dolphin_SRCS
 
 ##########################################
 
 set(dolphin_SRCS

-    dolphinapplication.cpp

     dolphindockwidget.cpp
     dolphinmainwindow.cpp
     dolphinviewcontainer.cpp
     dolphindockwidget.cpp
     dolphinmainwindow.cpp
     dolphinviewcontainer.cpp


@@ -199,9 +247,12 @@ set(dolphin_SRCS
     statusbar/spaceinfoobserver.cpp
     statusbar/statusbarspaceinfo.cpp
     views/zoomlevelinfo.cpp
     statusbar/spaceinfoobserver.cpp
     statusbar/statusbarspaceinfo.cpp
     views/zoomlevelinfo.cpp

+    dolphindebug.cpp
+    dbusinterface.cpp
+    global.cpp

 )
 
 )
 

-kconfig_add_kcfg_files(dolphin_SRCS
+kconfig_add_kcfg_files(dolphin_SRCS GENERATE_MOC

     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
     panels/places/dolphin_placespanelsettings.kcfgc
     panels/folders/dolphin_folderspanelsettings.kcfgc
     panels/information/dolphin_informationpanelsettings.kcfgc
     panels/places/dolphin_placespanelsettings.kcfgc


@@ -225,14 +276,15 @@ kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 target_include_directories(kdeinit_dolphin PRIVATE ${PHONON_INCLUDES})
 
 target_link_libraries(kdeinit_dolphin
 target_include_directories(kdeinit_dolphin PRIVATE ${PHONON_INCLUDES})
 
 target_link_libraries(kdeinit_dolphin

-    KF5::Konq

     dolphinprivate
     dolphinprivate

-    KF5::NewStuff

     KF5::Parts
     KF5::KCMUtils
     KF5::Solid
     KF5::Parts
     KF5::KCMUtils
     KF5::Solid

+    KF5::CoreAddons
+    KF5::DBusAddons
+    KF5::Bookmarks
+    KF5::Notifications

     Phonon::phonon4qt5
     Phonon::phonon4qt5

-    KF5::KDELibs4Support

 )
 
 if (KF5Activities_FOUND)
 )
 
 if (KF5Activities_FOUND)


@@ -242,8 +294,17 @@ if (KF5Activities_FOUND)
     )
 endif()
 
     )
 endif()
 

-install(TARGETS kdeinit_dolphin ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-install(TARGETS dolphin ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+include(DbusInterfaceMacros)
+
+generate_and_install_dbus_interface(
+    kdeinit_dolphin
+    dbusinterface.h
+    org.freedesktop.FileManager1.xml
+    OPTIONS -a
+)
+
+install(TARGETS kdeinit_dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

 
 ##########################################
 
 
 ##########################################
 


@@ -300,47 +361,38 @@ add_library(kcm_dolphinnavigation MODULE ${kcm_dolphinnavigation_PART_SRCS})
 add_library(kcm_dolphinservices MODULE ${kcm_dolphinservices_PART_SRCS})
 add_library(kcm_dolphingeneral MODULE ${kcm_dolphingeneral_PART_SRCS})
 
 add_library(kcm_dolphinservices MODULE ${kcm_dolphinservices_PART_SRCS})
 add_library(kcm_dolphingeneral MODULE ${kcm_dolphingeneral_PART_SRCS})
 

-target_link_libraries(kcm_dolphinviewmodes KF5::KDELibs4Support dolphinprivate)
-target_link_libraries(kcm_dolphinnavigation KF5::KDELibs4Support dolphinprivate)
-target_link_libraries(kcm_dolphinservices KF5::KDELibs4Support dolphinprivate)
-target_link_libraries(kcm_dolphingeneral KF5::KDELibs4Support dolphinprivate)
-
-install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} )
-install(TARGETS kcm_dolphinnavigation DESTINATION ${PLUGIN_INSTALL_DIR} )
-install(TARGETS kcm_dolphinservices DESTINATION ${PLUGIN_INSTALL_DIR} )
-install(TARGETS kcm_dolphingeneral DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-#########################################
-
-set(kio_search_PART_SRCS
-    search/filenamesearchprotocol.cpp)
+target_link_libraries(kcm_dolphinviewmodes dolphinprivate)
+target_link_libraries(kcm_dolphinnavigation dolphinprivate)
+target_link_libraries(kcm_dolphinservices dolphinprivate)
+target_link_libraries(kcm_dolphingeneral dolphinprivate)

 
 

-add_library(kio_filenamesearch MODULE ${kio_search_PART_SRCS})
-
-target_link_libraries(kio_filenamesearch KF5::KDELibs4Support)
-
-install(TARGETS kio_filenamesearch DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_dolphinservices DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR} )

 
 ########### install files ###############
 
 
 ########### install files ###############
 

-install( PROGRAMS org.kde.dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( PROGRAMS org.kde.dolphin.desktop DESTINATION ${KDE_INSTALL_APPDIR} )

 install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_generalsettings.kcfg
                settings/dolphin_compactmodesettings.kcfg
                settings/dolphin_iconsmodesettings.kcfg
                settings/dolphin_detailsmodesettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
 install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_generalsettings.kcfg
                settings/dolphin_compactmodesettings.kcfg
                settings/dolphin_iconsmodesettings.kcfg
                settings/dolphin_detailsmodesettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg

-         DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES dolphinui.rc DESTINATION ${CMAKE_INSTALL_KXMLGUI5DIR}/dolphin )
-install( FILES dolphin.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
-install( FILES search/filenamesearch.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+         DESTINATION ${KDE_INSTALL_KCFGDIR} )
+install( FILES dolphinui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphin )
+install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )

 install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
 install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION

-${SERVICES_INSTALL_DIR} )
-install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES settings/services/servicemenu.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
-install( PROGRAMS settings/services/servicemenuinstallation DESTINATION ${BIN_INSTALL_DIR} )
-install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION ${BIN_INSTALL_DIR} )
-
-add_subdirectory(tests)
+${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES settings/services/servicemenu.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
+install( PROGRAMS settings/services/servicemenuinstallation DESTINATION ${KDE_INSTALL_BINDIR} )
+install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION ${KDE_INSTALL_BINDIR} )
+
+if(BUILD_TESTING)
+    find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+    add_subdirectory(tests)
+endif()