From f3ee79bb687b0a144f6b48c3acf9bf22fb822fab Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Sun, 20 Dec 2009 04:28:22 +0000 Subject: [PATCH] [kdebase/apps/dolphin/CMakeLists.txt] Fixed compilation without Nepomuk CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdebase/apps/; revision=1064077 --- src/CMakeLists.txt | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bc2d46e75c..83e2e241df 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,17 +1,24 @@ find_package(QImageBlitz REQUIRED) +macro_optional_find_package(SharedDesktopOntologies) +macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE "" "Ontologies necessary for the Nepomuk semantic desktop.") + 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) + +if(SHAREDDESKTOPONTOLOGIES_FOUND AND Nepomuk_FOUND) + set(HAVE_NEPOMUK TRUE) +endif(SHAREDDESKTOPONTOLOGIES_FOUND AND Nepomuk_FOUND) + configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h ) include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${QIMAGEBLITZ_INCLUDES} ) -if (Nepomuk_FOUND) +if (HAVE_NEPOMUK) # Yes, Soprano includes is what we need here include_directories( ${SOPRANO_INCLUDE_DIR} ${NEPOMUK_INCLUDE_DIR} ) -endif (Nepomuk_FOUND) +endif (HAVE_NEPOMUK) ########### next target ############### @@ -53,8 +60,8 @@ set(dolphinprivate_LIB_SRCS viewproperties.cpp zoomlevelinfo.cpp ) - -if(Nepomuk_FOUND) + +if(HAVE_NEPOMUK) set(dolphinprivate_LIB_SRCS ${dolphinprivate_LIB_SRCS} panels/information/kcommentwidget.cpp @@ -63,7 +70,7 @@ if(Nepomuk_FOUND) panels/information/nepomukmassupdatejob.cpp panels/information/ktaggingwidget.cpp ) -endif(Nepomuk_FOUND) +endif(HAVE_NEPOMUK) kde4_add_kcfg_files(dolphinprivate_LIB_SRCS settings/dolphin_columnmodesettings.kcfgc @@ -80,9 +87,9 @@ target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${KDE4_KNEWSTUFF3_L if(X11_Xrender_FOUND) target_link_libraries(dolphinprivate ${X11_Xrender_LIB} ) endif(X11_Xrender_FOUND) -if (Nepomuk_FOUND) +if (HAVE_NEPOMUK) target_link_libraries(dolphinprivate ${NEPOMUK_LIBRARIES} ${NEPOMUK_QUERY_LIBRARIES} ${SOPRANO_LIBRARIES}) -endif (Nepomuk_FOUND) +endif (HAVE_NEPOMUK) set_target_properties(dolphinprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) @@ -167,7 +174,7 @@ kde4_add_kcfg_files(dolphin_SRCS search/dolphin_searchsettings.kcfgc ) -if(Nepomuk_FOUND) +if(HAVE_NEPOMUK) set(dolphin_SRCS ${dolphin_SRCS} panels/information/kcommentwidget.cpp @@ -180,10 +187,12 @@ if(Nepomuk_FOUND) search/searchcriterionselector.cpp search/searchcriterionvalue.cpp ) -endif(Nepomuk_FOUND) +endif(HAVE_NEPOMUK) -include(SopranoAddOntology) -soprano_add_ontology(dolphin_SRCS "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig" "NFO" "Nepomuk::Vocabulary" "trig") +if(HAVE_NEPOMUK) + include(SopranoAddOntology) + soprano_add_ontology(dolphin_SRCS "${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig" "NFO" "Nepomuk::Vocabulary" "trig") +endif(HAVE_NEPOMUK) if(NOT WIN32) set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalpanel.cpp) @@ -210,13 +219,13 @@ target_link_libraries(dolphin ${KDE4_PHONON_LIBS} ) -if (Nepomuk_FOUND) +if (HAVE_NEPOMUK) target_link_libraries(dolphin ${NEPOMUK_LIBRARIES} ${SOPRANO_LIBRARIES} ${NEPOMUK_QUERY_LIBRARIES} ) -endif (Nepomuk_FOUND) +endif (HAVE_NEPOMUK) install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS}) @@ -251,7 +260,7 @@ set(kcm_dolphingeneral_PART_SRCS settings/previewssettingspage.cpp settings/contextmenusettingspage.cpp settings/settingspagebase.cpp) -if (Nepomuk_FOUND) +if (HAVE_NEPOMUK) set(kcm_dolphingeneral_PART_SRCS ${kcm_dolphingeneral_PART_SRCS} panels/information/kcommentwidget.cpp @@ -260,7 +269,7 @@ if (Nepomuk_FOUND) panels/information/nepomukmassupdatejob.cpp panels/information/ktaggingwidget.cpp ) -endif (Nepomuk_FOUND) +endif (HAVE_NEPOMUK) kde4_add_kcfg_files(kcm_dolphinviewmodes_PART_SRCS settings/dolphin_columnmodesettings.kcfgc @@ -289,12 +298,12 @@ target_link_libraries(kcm_dolphinviewmodes ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS target_link_libraries(kcm_dolphinnavigation ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} dolphinprivate) target_link_libraries(kcm_dolphinservices ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} dolphinprivate) target_link_libraries(kcm_dolphingeneral ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} dolphinprivate) -if (Nepomuk_FOUND) +if (HAVE_NEPOMUK) target_link_libraries(kcm_dolphinviewmodes ${NEPOMUK_LIBRARIES}) target_link_libraries(kcm_dolphinnavigation ${NEPOMUK_LIBRARIES}) target_link_libraries(kcm_dolphinservices ${NEPOMUK_LIBRARIES}) target_link_libraries(kcm_dolphingeneral ${NEPOMUK_LIBRARIES}) -endif (Nepomuk_FOUND) +endif (HAVE_NEPOMUK) install(TARGETS kcm_dolphinviewmodes DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kcm_dolphinnavigation DESTINATION ${PLUGIN_INSTALL_DIR} )