Adapt Dolphin Nepomuk support to namespace changes.

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d855532c594313a9136febaec3fb79d91d18be0..04b4b9bd743216a49aa9b5c5d4e000f634024e80 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,9 @@
 
 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)
 
@@ -17,6 +18,7 @@ set(dolphinprivate_LIB_SRCS
     dolphinsettings.cpp
     viewproperties.cpp
     dolphinsortfilterproxymodel.cpp
+    renamedialog.cpp
     )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
@@ -48,6 +50,7 @@ set(dolphin_SRCS
    dolphinmainwindow.cpp
    dolphinnewmenu.cpp
    dolphinview.cpp
+   dolphinviewcontainer.cpp
    dolphinstatusbar.cpp
    dolphindirlister.cpp
    dolphincontextmenu.cpp
@@ -61,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
@@ -82,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})
 
@@ -103,9 +104,5 @@ install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_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
-    klistview.h
-    kitemcategorizer.h
-    DESTINATION ${INCLUDE_INSTALL_DIR})
 
 kde4_install_icons( ${ICON_INSTALL_DIR} )