diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-02-10 10:10:45 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-02-10 10:10:45 +0100 |
| commit | 09983747f71fd7bd8f8dc0cece1fe3b4a996ef72 (patch) | |
| tree | 91e843d5e6242af8c4d7cee3722d4eddca97524a /src/CMakeLists.txt | |
| parent | SVN_SILENT made messages (.desktop file) (diff) | |
| download | rekonq-09983747f71fd7bd8f8dc0cece1fe3b4a996ef72.tar.xz | |
Restore rekonq migration to nepomuk2
Being kde 4.10 been released, we are ready to. I yet could not
understand if this compiles (without nepomuk) in 4.9.
CCMAIL:david.narvaez@computer.org
CCMAIL:me@vhanda.in
REVIEW: 108152
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 019c51f8..1a53c37a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -111,13 +111,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 @@ -181,13 +183,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) @@ -232,13 +235,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) @@ -260,3 +262,4 @@ INSTALL( TARGETS kdeinit_rekonq ${INSTALL_TARGETS_DEFAULT_ARGS} ) INSTALL( FILES rekonq.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) INSTALL( FILES webwindow/rekonqui.rc DESTINATION ${DATA_INSTALL_DIR}/rekonq ) + |