diff options
| author | Pino Toscano <pino@kde.org> | 2013-03-16 11:59:03 +0100 |
|---|---|---|
| committer | Pino Toscano <pino@kde.org> | 2013-03-16 11:59:03 +0100 |
| commit | e53f125681585672399efeb6232dfe9aed7d6d16 (patch) | |
| tree | 8f51be2c8d09998c07a7b18bafac19ba65bad1b6 | |
| parent | cmake: use the kactivities include dirs, if found (diff) | |
| download | rekonq-e53f125681585672399efeb6232dfe9aed7d6d16.tar.xz | |
cmake: soprano is needed aside nepomuk-core
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bfaaf4f..e323a801 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,11 +49,13 @@ ADD_DEFINITIONS(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) # ================================================================================== # optional nepomuk requirements +FIND_PACKAGE(Soprano) + FIND_PACKAGE(NepomukCore 0.1.0) -IF(NepomukCore_FOUND) +IF(SOPRANO_FOUND AND NepomukCore_FOUND) ADD_DEFINITIONS(-DHAVE_NEPOMUK) -ENDIF(NepomukCore_FOUND) +ENDIF(SOPRANO_FOUND AND NepomukCore_FOUND) # ================================================================================== # optional QCA2 & QtOAuth requirements @@ -146,13 +148,13 @@ IF(REKONQ_CAN_BE_COMPILED) # Nepomuk - IF(NepomukCore_FOUND) + IF(SOPRANO_FOUND AND NepomukCore_FOUND) MESSAGE(STATUS " Nepomuk Libraries..................... YES") MESSAGE(STATUS " Rekonq will be compiled with support for bookmarks nepomuk tagging") - ELSE(NepomukCore_FOUND) + ELSE(SOPRANO_FOUND AND NepomukCore_FOUND) MESSAGE(STATUS " Nepomuk Libraries..................... NO") MESSAGE(STATUS " Rekonq will be compiled WITHOUT support for bookmarks tagging") - ENDIF(NepomukCore_FOUND) + ENDIF(SOPRANO_FOUND AND NepomukCore_FOUND) MESSAGE(STATUS "") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb5a87df..3e84d13d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -193,14 +193,14 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ) # Nepomuk optional include directories -IF(NepomukCore_FOUND) +IF(SOPRANO_FOUND AND NepomukCore_FOUND) INCLUDE_DIRECTORIES(${SOPRANO_INCLUDE_DIR} ${NEPOMUK_CORE_INCLUDE_DIR} ) FIND_PACKAGE(Soprano REQUIRED) INCLUDE(SopranoAddOntology) -ENDIF(NepomukCore_FOUND) +ENDIF(SOPRANO_FOUND AND NepomukCore_FOUND) # Opera sync optional include directories IF(HAVE_QCA2 AND HAVE_QTOAUTH) @@ -251,12 +251,12 @@ TARGET_LINK_LIBRARIES ( kdeinit_rekonq ) # Nepomuk optional target link libraries -IF(NepomukCore_FOUND) +IF(SOPRANO_FOUND AND NepomukCore_FOUND) TARGET_LINK_LIBRARIES( kdeinit_rekonq ${NEPOMUK_CORE_LIBRARY} ${SOPRANO_LIBRARIES} ) -ENDIF(NepomukCore_FOUND) +ENDIF(SOPRANO_FOUND AND NepomukCore_FOUND) # KActivities optional target link libraries IF(HAVE_KACTIVITIES) |