X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/52c3d5a2228d6496a5d08f4637984e9cf3c9a9f7..b2547cf9a48356fa8db847bbb6b713f699d48814:/src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e7a5d6c1..04b4b9bd7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,35 +1,39 @@
 
 add_subdirectory( pics )
 add_subdirectory( servicemenus )
+add_subdirectory( tests )
 
-include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
+include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
 
 add_definitions (-DQT3_SUPPORT)
 
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-	dolphincontroller.cpp
-	dolphindetailsview.cpp
-	dolphiniconsview.cpp
-	dolphinsettings.cpp
-	viewproperties.cpp
-	dolphinsortfilterproxymodel.cpp
-	)
+    dolphincontroller.cpp
+    dolphindetailsview.cpp
+    dolphiniconsview.cpp
+    dolphinitemcategorizer.cpp
+    klistview.cpp
+    dolphinsettings.cpp
+    viewproperties.cpp
+    dolphinsortfilterproxymodel.cpp
+    renamedialog.cpp
+    )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
-   dolphin_columnmodesettings.kcfgc
-   dolphin_directoryviewpropertysettings.kcfgc
-   dolphin_detailsmodesettings.kcfgc
-   dolphin_iconsmodesettings.kcfgc
-   dolphin_generalsettings.kcfgc)
+    dolphin_columnmodesettings.kcfgc
+    dolphin_directoryviewpropertysettings.kcfgc
+    dolphin_detailsmodesettings.kcfgc
+    dolphin_iconsmodesettings.kcfgc
+    dolphin_generalsettings.kcfgc)
 
 
 kde4_automoc(${dolphinprivate_LIB_SRCS})
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
-target_link_libraries(dolphinprivate ${KDE4_KDEUI_LIBS} konq)
+target_link_libraries(dolphinprivate ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} konq)
 
 set_target_properties(dolphinprivate PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 install(TARGETS dolphinprivate  DESTINATION ${LIB_INSTALL_DIR} )
@@ -39,8 +43,6 @@ install(TARGETS dolphinprivate  DESTINATION ${LIB_INSTALL_DIR} )
 
 set(dolphin_SRCS
    applyviewpropsjob.cpp
-   bookmarkssettingspage.cpp
-   bookmarkssidebarpage.cpp
    columnviewsettingspage.cpp
    detailsviewsettingspage.cpp
    dolphinapplication.cpp
@@ -48,11 +50,11 @@ set(dolphin_SRCS
    dolphinmainwindow.cpp
    dolphinnewmenu.cpp
    dolphinview.cpp
+   dolphinviewcontainer.cpp
    dolphinstatusbar.cpp
    dolphindirlister.cpp
    dolphincontextmenu.cpp
    dolphinsettingsdialog.cpp
-   editbookmarkdialog.cpp
    filterbar.cpp
    generalsettingspage.cpp
    generalviewsettingspage.cpp
@@ -62,11 +64,11 @@ set(dolphin_SRCS
    main.cpp
    metadatawidget.cpp
    pixmapviewer.cpp
-   renamedialog.cpp
    settingspagebase.cpp
    sidebarpage.cpp
    statusbarspaceinfo.cpp
    statusbarmessagelabel.cpp
+   terminalsidebarpage.cpp
    treeviewcontextmenu.cpp
    treeviewsidebarpage.cpp
    sidebartreeview.cpp
@@ -83,18 +85,16 @@ qt4_add_dbus_adaptor(dolphin_SRCS
    org.kde.dolphin.MainWindow.xml
    dolphinmainwindow.h DolphinMainWindow)
 kde4_add_executable(dolphin ${dolphin_SRCS})
-# find Nepomuk's libkmetadata
-find_path(KMETADATA_INCLUDE_DIR NAMES kmetadata/kmetadata.h PATHS ${KDE4_INCLUDE_DIR})
-find_library(KMETADATA_LIBRARY NAMES kmetadata kmetadatatools PATHS ${KDE4_LIB_DIR})
-find_library(KMETADATA_TOOLS_LIBRARY NAMES kmetadatatools PATHS ${KDE4_LIB_DIR})
-if(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARY AND KMETADATA_TOOLS_LIBRARY)
-set(KDE4_KMETADATA kmetadata kmetadatatools)
-set(HAVE_KMETADATA 1)
-else(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARY)
-set(KDE4_KMETADATA "")
-endif(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARY AND KMETADATA_TOOLS_LIBRARY)
-configure_file(config-kmetadata.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmetadata.h )
-target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KMETADATA} konq dolphinprivate)
+
+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)
+
+if (Nepomuk_FOUND)
+  target_link_libraries(dolphin ${NEPOMUK_LIBRARIES})
+endif (Nepomuk_FOUND)
 
 install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})