From bf202f3931c804af1c03bd958a8e946bab8b4b52 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Wed, 2 Jan 2013 16:34:18 +0530 Subject: Dolphin Information Panel: Use Nepomuk2::FileMetadataWidget Instead of the KFileMetadataWidget. The Nepomuk widget is just a copy of the KFileMetadataWidget which utilizes Nepomuk2. --- src/CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f8d266994..b7aa5b385 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,6 @@ macro_optional_find_package(Soprano) macro_optional_find_package(NepomukCore) +macro_optional_find_package(NepomukWidgets) macro_log_feature(NepomukCore_FOUND "Nepomuk" "Nepomuk" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin") macro_bool_to_01(NepomukCore_FOUND HAVE_NEPOMUK) configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) @@ -11,7 +12,7 @@ include_directories( ${KACTIVITIES_INCLUDE_DIRS} ) if (NepomukCore_FOUND) # Yes, Soprano includes is what we need here - include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} ) + include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} ${NEPOMUK_WIDGETS_INCLUDE_DIR} ) endif (NepomukCore_FOUND) add_subdirectory(tests) @@ -103,6 +104,7 @@ if (NepomukCore_FOUND) target_link_libraries( dolphinprivate ${NEPOMUK_CORE_LIBRARY} + ${NEPOMUK_WIDGETS_LIBRARY} ${SOPRANO_LIBRARIES} ) endif (NepomukCore_FOUND) @@ -228,6 +230,7 @@ target_link_libraries(kdeinit_dolphin if (NepomukCore_FOUND) target_link_libraries(kdeinit_dolphin ${NEPOMUK_CORE_LIBRARY} + ${NEPOMUK_WIDGETS_LIBRARY} ${SOPRANO_LIBRARIES} ) endif (NepomukCore_FOUND) @@ -302,10 +305,10 @@ target_link_libraries(kcm_dolphinnavigation ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIB target_link_libraries(kcm_dolphinservices ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} dolphinprivate) target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate) if (NepomukCore_FOUND) - target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_CORE_LIBRARY}) - target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_CORE_LIBRARY}) - target_link_libraries(kcm_dolphinservices ${NEPOMUK_CORE_LIBRARY}) - target_link_libraries(kcm_dolphingeneral ${NEPOMUK_CORE_LIBRARY}) + target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY}) + target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY}) + target_link_libraries(kcm_dolphinservices ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY}) + target_link_libraries(kcm_dolphingeneral ${NEPOMUK_CORE_LIBRARY} ${NEPOMUK_WIDGETS_LIBRARY}) endif (NepomukCore_FOUND) install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} ) -- cgit v1.3.1