Forwardport 773570:

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a2aad29a3bafde0813df67befc1c4f2e14c90a24..f5a6c3ed9c993307fd1e1f40d8287aabbe27c5c1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,13 @@
 
 add_subdirectory( pics )
 
 add_subdirectory( pics )

-add_subdirectory( servicemenus )

 add_subdirectory( tests )
 
 add_subdirectory( tests )
 

-include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+macro_optional_find_package(Soprano)

 
 

-add_definitions (-DQT3_SUPPORT)
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${BLITZ_INCLUDES} )
+if (Soprano_FOUND)
+  include_directories( ${SOPRANO_INCLUDE_DIR} )
+endif (Soprano_FOUND)

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


@@ -14,14 +16,21 @@ set(dolphinprivate_LIB_SRCS
     dolphindetailsview.cpp
     dolphiniconsview.cpp
     dolphincolumnview.cpp
     dolphindetailsview.cpp
     dolphiniconsview.cpp
     dolphincolumnview.cpp

-    dolphinitemcategorizer.cpp
-    klistview.cpp
-    ksortfilterproxymodel.cpp
-    dolphinsettings.cpp
-    viewproperties.cpp
+    dolphincolumnwidget.cpp
+    dolphindropcontroller.cpp

     dolphinsortfilterproxymodel.cpp
     dolphinsortfilterproxymodel.cpp

-    renamedialog.cpp
+    draganddrophelper.cpp
+    dolphinmodel.cpp
+    dolphinsettings.cpp
+    dolphincategorydrawer.cpp

     dolphinview.cpp
     dolphinview.cpp

+    dolphinviewactionhandler.cpp
+    iconmanager.cpp
+    ratingpainter.cpp
+    renamedialog.cpp
+    selectiontoggle.cpp
+    selectionmanager.cpp
+    viewproperties.cpp

     )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
     )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS


@@ -32,23 +41,23 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
     dolphin_generalsettings.kcfgc)
 
 
     dolphin_generalsettings.kcfgc)
 
 

-kde4_automoc(${dolphinprivate_LIB_SRCS})

 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
 find_package(Nepomuk)
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
 find_package(Nepomuk)

+find_package(Soprano)

 macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK)
 
 configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
 
 macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK)
 
 configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
 

-target_link_libraries(dolphinprivate ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} konq)
+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${BLITZ_LIBRARIES})

 if (Nepomuk_FOUND)
 if (Nepomuk_FOUND)

-  target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES})
+  target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES})

 endif (Nepomuk_FOUND)
 
 
 endif (Nepomuk_FOUND)
 
 

-set_target_properties(dolphinprivate PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-install(TARGETS dolphinprivate  DESTINATION ${LIB_INSTALL_DIR} )
+set_target_properties(dolphinprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+install(TARGETS dolphinprivate  DESTINATION ${LIB_INSTALL_DIR})

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


@@ -57,7 +66,6 @@ set(dolphinpart_SRCS
    dolphinpart.cpp
 )
 
    dolphinpart.cpp
 )
 

-kde4_automoc(${dolphinpart_SRCS})

 
 kde4_add_plugin(dolphinpart ${dolphinpart_SRCS})
 
 
 kde4_add_plugin(dolphinpart ${dolphinpart_SRCS})
 


@@ -72,6 +80,7 @@ install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 ##########################################
 
 set(dolphin_SRCS
 ##########################################
 
 set(dolphin_SRCS

+   additionalinfodialog.cpp

    applyviewpropsjob.cpp
    columnviewsettingspage.cpp
    detailsviewsettingspage.cpp
    applyviewpropsjob.cpp
    columnviewsettingspage.cpp
    detailsviewsettingspage.cpp


@@ -82,7 +91,9 @@ set(dolphin_SRCS
    dolphinstatusbar.cpp
    dolphindirlister.cpp
    dolphincontextmenu.cpp
    dolphinstatusbar.cpp
    dolphindirlister.cpp
    dolphincontextmenu.cpp

+   dolphinfileplacesview.cpp

    dolphinsettingsdialog.cpp
    dolphinsettingsdialog.cpp

+   draganddrophelper.cpp

    filterbar.cpp
    generalsettingspage.cpp
    generalviewsettingspage.cpp
    filterbar.cpp
    generalsettingspage.cpp
    generalviewsettingspage.cpp


@@ -94,6 +105,7 @@ set(dolphin_SRCS
    pixmapviewer.cpp
    settingspagebase.cpp
    sidebarpage.cpp
    pixmapviewer.cpp
    settingspagebase.cpp
    sidebarpage.cpp

+   startupsettingspage.cpp

    statusbarspaceinfo.cpp
    statusbarmessagelabel.cpp
    terminalsidebarpage.cpp
    statusbarspaceinfo.cpp
    statusbarmessagelabel.cpp
    terminalsidebarpage.cpp


@@ -104,7 +116,6 @@ set(dolphin_SRCS
    viewsettingspage.cpp
    viewpropsprogressinfo.cpp )
 
    viewsettingspage.cpp
    viewpropsprogressinfo.cpp )
 

-kde4_automoc(${dolphin_SRCS})

 
 qt4_add_dbus_adaptor(dolphin_SRCS
    org.kde.dolphin.Application.xml
 
 qt4_add_dbus_adaptor(dolphin_SRCS
    org.kde.dolphin.Application.xml


@@ -114,11 +125,7 @@ qt4_add_dbus_adaptor(dolphin_SRCS
    dolphinmainwindow.h DolphinMainWindow)
 kde4_add_executable(dolphin ${dolphin_SRCS})
 
    dolphinmainwindow.h DolphinMainWindow)
 kde4_add_executable(dolphin ${dolphin_SRCS})
 

-find_package(Nepomuk)
-macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK)
-
-configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
-target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate)
+target_link_libraries(dolphin  ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} konq dolphinprivate)

 
 if (Nepomuk_FOUND)
   target_link_libraries(dolphin ${NEPOMUK_LIBRARIES})
 
 if (Nepomuk_FOUND)
   target_link_libraries(dolphin ${NEPOMUK_LIBRARIES})


@@ -129,8 +136,6 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 
 ########### install files ###############
 
 
 ########### install files ###############
 

-install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_DIR} )
+install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )

 install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_columnmodesettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_columnmodesettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )

-
-kde4_install_icons( ${ICON_INSTALL_DIR} )