diff options
| author | David E. Narváez <david.narvaez@computer.org> | 2013-01-07 12:30:23 -0500 |
|---|---|---|
| committer | David E. Narváez <david.narvaez@computer.org> | 2013-01-07 12:30:23 -0500 |
| commit | 6d2519d373350b5e904fb421d688a665dd42c0c1 (patch) | |
| tree | 5f76950325088ee14091ae1baf15a9d9e7d48e7a /src/CMakeLists.txt | |
| parent | Make it compile (diff) | |
| download | rekonq-6d2519d373350b5e904fb421d688a665dd42c0c1.tar.xz | |
Rekonq Migration to Nepomuk2
Ran the Nepomuk migration script and added a directory with code that
has not yet been ported to Nepomuk2. Also did some CMake changes to be
able to drop the config-nepomuk.h.cmake file.
REVIEW: 108152
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 143f9dc1..69821d81 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -110,13 +110,15 @@ set(rekonq_KDEINIT_SRCS # Nepomuk OPTIONAL src files -IF(HAVE_NEPOMUK) +IF(NepomukCore_FOUND) SET( rekonq_KDEINIT_SRCS ${rekonq_KDEINIT_SRCS} urlbar/resourcelinkdialog.cpp urlbar/newresourcedialog.cpp + nepomuk/utils/simpleresourcemodel.cpp + nepomuk/utils/resourcemodel.cpp ) -ENDIF(HAVE_NEPOMUK) +ENDIF(NepomukCore_FOUND) # Opera sync optional src files @@ -180,13 +182,14 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ) # Nepomuk optional include directories -IF(HAVE_NEPOMUK) +IF(NepomukCore_FOUND) INCLUDE_DIRECTORIES(${SOPRANO_INCLUDE_DIR} - ${NEPOMUK_INCLUDE_DIR} + ${NEPOMUK_CORE_INCLUDE_DIR} ) + FIND_PACKAGE(Soprano REQUIRED) INCLUDE(SopranoAddOntology) -ENDIF(HAVE_NEPOMUK) +ENDIF(NepomukCore_FOUND) # Opera sync optional include directories IF(HAVE_QCA2 AND HAVE_QTOAUTH) @@ -231,13 +234,12 @@ TARGET_LINK_LIBRARIES ( kdeinit_rekonq ) # Nepomuk optional target link libraries -IF(HAVE_NEPOMUK) +IF(NepomukCore_FOUND) TARGET_LINK_LIBRARIES( kdeinit_rekonq - ${NEPOMUK_LIBRARIES} - ${NEPOMUK_QUERY_LIBRARIES} + ${NEPOMUK_CORE_LIBRARY} ${SOPRANO_LIBRARIES} ) -ENDIF(HAVE_NEPOMUK) +ENDIF(NepomukCore_FOUND) # Opera sync optional link libraries IF(HAVE_QCA2 AND HAVE_QTOAUTH) |