From: Friedrich W. H. Kossebau Date: Sat, 20 Nov 2010 21:27:36 +0000 (+0000) Subject: changed: QImageBlitz is no longer used, so do not require and link to it (useful... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/452fa54f4e2f0b8d2602b1dea961ec26d498eae0?ds=sidebyside changed: QImageBlitz is no longer used, so do not require and link to it (useful for built on MeeGo) svn path=/trunk/KDE/kdebase/apps/; revision=1199156 --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8cd67436b..4d442bbcd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,13 +1,11 @@ add_subdirectory(tests) -find_package(QImageBlitz REQUIRED) - macro_optional_find_package(Nepomuk) macro_log_feature(Nepomuk_FOUND "Nepomuk" "Nepomuk" "http://www.kde.org" FALSE "" "For adding desktop-wide tagging support to dolphin") macro_bool_to_01(Nepomuk_FOUND HAVE_NEPOMUK) configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) -include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${QIMAGEBLITZ_INCLUDES} ) +include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ) if (Nepomuk_FOUND) # Yes, Soprano includes is what we need here @@ -68,7 +66,7 @@ kde4_add_kcfg_files(dolphinprivate_LIB_SRCS kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS}) -target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS} ${QIMAGEBLITZ_LIBRARIES}) +target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_LIBS}) if (Nepomuk_FOUND) target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${NEPOMUK_QUERY_LIBRARIES} nepomukutils ${SOPRANO_LIBRARIES}) endif (Nepomuk_FOUND)