Merge branch 'KDE/4.10'

Conflicts:
	dolphin/src/CMakeLists.txt

1 files changed, 21 insertions, 14 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0beafa80..4b31ab6a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,17 +5,25 @@ set_package_properties(NepomukCore PROPERTIES DESCRIPTION "Nepomuk Core librarie
                        PURPOSE "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 )
-
 macro_optional_find_package(NepomukWidgets)
+set_package_properties(NepomukWidgets PROPERTIES DESCRIPTION "Nepomuk Widgets"
+                       URL "http://www.kde.org"
+                       TYPE OPTIONAL
+                       PURPOSE "For adding desktop-wide tagging support to dolphin"
+                      )
+
+if(NepomukCore_FOUND AND NepomukWidgets_FOUND)
+    set(HAVE_NEPOMUK TRUE)
+endif()
+
+configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
 
 macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
 configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
 
 include_directories( ${KACTIVITIES_INCLUDE_DIRS} )
 
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
   find_package(Soprano 2.7.56)
   set_package_properties(Soprano PROPERTIES DESCRIPTION "Qt-based RDF storage and parsing solution"
                          URL "http://soprano.sourceforge.net"
@@ -23,9 +31,8 @@ if (NepomukCore_FOUND)
                          PURPOSE "Required for everything (storage and general data management)"
                         )
 
-  # Yes, Soprano includes is what we need here
   include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} ${NEPOMUK_WIDGETS_INCLUDE_DIR} )
-endif (NepomukCore_FOUND)
+endif()
 
 add_subdirectory(tests)
 
@@ -87,12 +94,12 @@ set(dolphinprivate_LIB_SRCS
     views/zoomlevelinfo.cpp
 )
 
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
     set(dolphinprivate_LIB_SRCS
         ${dolphinprivate_LIB_SRCS}
         kitemviews/private/knepomukrolesprovider.cpp
     )
-endif (NepomukCore_FOUND)
+endif()
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
     settings/dolphin_compactmodesettings.kcfgc
@@ -112,14 +119,14 @@ target_link_libraries(
     ${KDE4_KNEWSTUFF3_LIBS}
 )
 
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
     target_link_libraries(
         dolphinprivate
         ${NEPOMUK_CORE_LIBRARY}
         ${NEPOMUK_WIDGETS_LIBRARY}
         ${SOPRANO_LIBRARIES}
     )
-endif (NepomukCore_FOUND)
+endif()
 
 if(X11_Xrender_FOUND)
     target_link_libraries(dolphinprivate ${X11_Xrender_LIB})
@@ -239,13 +246,13 @@ target_link_libraries(kdeinit_dolphin
     ${KDE4_PHONON_LIBS}
 )
 
-if (NepomukCore_FOUND)
+if(HAVE_NEPOMUK)
     target_link_libraries(kdeinit_dolphin
         ${NEPOMUK_CORE_LIBRARY}
         ${NEPOMUK_WIDGETS_LIBRARY}
         ${SOPRANO_LIBRARIES}
     )
-endif (NepomukCore_FOUND)
+endif()
 
 if (KActivities_FOUND)
     target_link_libraries(
@@ -316,12 +323,12 @@ target_link_libraries(kcm_dolphinviewmodes  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS
 target_link_libraries(kcm_dolphinnavigation  ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate)
 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)
+if(HAVE_NEPOMUK)
   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)
+endif()
 
 install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kcm_dolphinnavigation DESTINATION ${PLUGIN_INSTALL_DIR} )