From a70fcc635377b48846451a99d2954220d79f9caa Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Tue, 3 Jun 2008 14:34:10 +0000 Subject: [PATCH] Fixed Nepomuk dependancy checking svn path=/trunk/KDE/kdebase/apps/; revision=816282 --- src/CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b548c723f..829c7f034 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,13 +3,16 @@ add_subdirectory( pics ) add_subdirectory( tests ) find_package(QImageBlitz REQUIRED) -macro_optional_find_package(Soprano) + +macro_optional_find_package(Nepomuk) +macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${QIMAGEBLITZ_INCLUDES} ) -if (Soprano_FOUND) - include_directories( ${SOPRANO_INCLUDE_DIR} ) -endif (Soprano_FOUND) +if (Nepomuk_FOUND) + # Yes, Soprano includes is what we need here + include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR} ) +endif (Nepomuk_FOUND) ########### next target ############### @@ -51,10 +54,6 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS}) -find_package(Nepomuk) -find_package(Soprano) -macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) - configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_LIBRARIES}) -- 2.47.3