aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2009-12-03 21:52:34 +0000
committerAlexander Neundorf <neundorf@kde.org>2009-12-03 21:52:34 +0000
commitf11f354de9484949ff5567f344b38207d67fcd46 (patch)
treea46cdeb70b126e846da4ce154d45b023f7e0eabd
parent0b4be0b79c76bf1d4db8a50e595e3b1f06a7a733 (diff)
downloadextra-cmake-modules-f11f354de9484949ff5567f344b38207d67fcd46.tar.gz
extra-cmake-modules-f11f354de9484949ff5567f344b38207d67fcd46.tar.bz2
-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
-rw-r--r--modules/FindNepomuk.cmake14
1 files changed, 11 insertions, 3 deletions
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