* Added KMetaData cmake check

* Fixed Dolphin+KMetaData compilation
* Moved knepomuk tests into kdebase

svn path=/trunk/KDE/kdebase/apps/; revision=660109

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2af19b4ec4e1545d459ebf772f60edd0ae95041..092abc011fe0b182ad7bbd541d4b50f6420def46 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,18 +82,15 @@ qt4_add_dbus_adaptor(dolphin_SRCS
    org.kde.dolphin.MainWindow.xml
    dolphinmainwindow.h DolphinMainWindow)
 kde4_add_executable(dolphin ${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)
+
+if(KMetaData_FOUND)
+  set(HAVE_KMETADATA 1)
+else(KMetaData_FOUND)
+  set(KDE4_KMETADATA "")
+endif(KMetaData_FOUND)
+

 configure_file(config-kmetadata.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kmetadata.h )
 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)
+target_link_libraries(dolphin  ${KDE4_KDECORE_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KFILE_LIBS} ${KMETADATA_LIBRARIES} konq dolphinprivate)

 
 install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})
 
 
 install(TARGETS dolphin DESTINATION ${BIN_INSTALL_DIR})