From 14299bca34712251a215a7d20feecab44426632b Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 8 Jan 2013 16:49:31 +0100 Subject: Revert "Rekonq Migration to Nepomuk2" This reverts commit 6d2519d373350b5e904fb421d688a665dd42c0c1. This let rekonq compile again. Nepomuk2 will be added back when KDE 4.10 will be released. --- src/CMakeLists.txt | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 69821d81..143f9dc1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -110,15 +110,13 @@ set(rekonq_KDEINIT_SRCS # Nepomuk OPTIONAL src files -IF(NepomukCore_FOUND) +IF(HAVE_NEPOMUK) SET( rekonq_KDEINIT_SRCS ${rekonq_KDEINIT_SRCS} urlbar/resourcelinkdialog.cpp urlbar/newresourcedialog.cpp - nepomuk/utils/simpleresourcemodel.cpp - nepomuk/utils/resourcemodel.cpp ) -ENDIF(NepomukCore_FOUND) +ENDIF(HAVE_NEPOMUK) # Opera sync optional src files @@ -182,14 +180,13 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ) # Nepomuk optional include directories -IF(NepomukCore_FOUND) +IF(HAVE_NEPOMUK) INCLUDE_DIRECTORIES(${SOPRANO_INCLUDE_DIR} - ${NEPOMUK_CORE_INCLUDE_DIR} + ${NEPOMUK_INCLUDE_DIR} ) - FIND_PACKAGE(Soprano REQUIRED) INCLUDE(SopranoAddOntology) -ENDIF(NepomukCore_FOUND) +ENDIF(HAVE_NEPOMUK) # Opera sync optional include directories IF(HAVE_QCA2 AND HAVE_QTOAUTH) @@ -234,12 +231,13 @@ TARGET_LINK_LIBRARIES ( kdeinit_rekonq ) # Nepomuk optional target link libraries -IF(NepomukCore_FOUND) +IF(HAVE_NEPOMUK) TARGET_LINK_LIBRARIES( kdeinit_rekonq - ${NEPOMUK_CORE_LIBRARY} + ${NEPOMUK_LIBRARIES} + ${NEPOMUK_QUERY_LIBRARIES} ${SOPRANO_LIBRARIES} ) -ENDIF(NepomukCore_FOUND) +ENDIF(HAVE_NEPOMUK) # Opera sync optional link libraries IF(HAVE_QCA2 AND HAVE_QTOAUTH) -- cgit v1.2.1