From f11f354de9484949ff5567f344b38207d67fcd46 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 3 Dec 2009 21:52:34 +0000 Subject: -autmatically include NepomukAddOn...cmake file, so modules using nepomuk don't have to do this unfortunately I couldn't test it, since I still have build problems with redland :-/ Sebastian, please check that it works as expected Alex CCMAIL: trueg@kde.org svn path=/trunk/KDE/kdelibs/; revision=1058066 --- modules/FindNepomuk.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index 35b7c4de..c4768002 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -54,14 +54,22 @@ find_library(NEPOMUK_QUERY_LIBRARIES ${LIB_INSTALL_DIR} ) -mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES) +find_file(NEPOMUK_ADDONTOLOGYCLASSES_FILE NepomukAddOntologyClasses.cmake + HINTS ${KDE4_DATA_INSTALL_DIR}/cmake/modules/ + PATH_SUFFIXES share/apps/cmake/modules/ + ) + +include("${NEPOMUK_ADDONTOLOGYCLASSES_FILE}" OPTIONAL) + +mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES NEPOMUK_ADDONTOLOGIES_FILE) include(FindPackageHandleStandardArgs) # List all nepomuk and also all necessary soprano variables here, to make it # easier for the user to see what was missing: find_package_handle_standard_args(Nepomuk DEFAULT_MSG - NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR - Soprano_FOUND SOPRANO_PLUGIN_RAPTORPARSER_FOUND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND SHAREDDESKTOPONTOLOGIES_FOUND + NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR NEPOMUK_ADDONTOLOGYCLASSES_FILE + Soprano_FOUND SOPRANO_PLUGIN_RAPTORPARSER_FOUND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND + SHAREDDESKTOPONTOLOGIES_FOUND ) #to retain backward compatibility -- cgit v1.2.1