From b579d6c4002a3f3825e873dfcee815ba3696b10e Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Mon, 11 Jun 2007 19:22:30 +0000 Subject: - Merged KMetaData, Konto, and KNepomuk into one nepomuk folder with two libs: 1. libnepomuk now contains KMetaData and Konto, only using one single namespace "Nepomuk" 2. libnepomuk-middleware is now what knepomuk was before and has the namespace "Nepomuk::Middleware" This makes the design much cleaner and less confusing since we have one name for everything: Nepomuk. I was not happy with Braid and we did not find another name so I stick to Nepomuk now. In the end people now already now this stuff as Nepomuk and it makes the project happy. ;) CCMAIL: nepomuk-kde.semanticdesktop.org svn path=/trunk/KDE/kdelibs/; revision=674110 --- modules/FindNepomuk.cmake | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 modules/FindNepomuk.cmake (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake new file mode 100644 index 00000000..dc1d36a7 --- /dev/null +++ b/modules/FindNepomuk.cmake @@ -0,0 +1,43 @@ +# Once done this will define +# +# NEPOMUK_FOUND - system has Nepomuk +# NEPOMUK_INCLUDE_DIR - the Nepomuk include directory +# NEPOMUK_LIBRARIES - Link these to use Nepomuk +# NEPOMUK_DEFINITIONS - Compiler switches required for using Nepomuk +# + +FIND_PATH(NEPOMUK_INCLUDE_DIR + NAMES + nepomuk/resource.h + PATHS + ${KDE4_INCLUDE_DIR} + ${INCLUDE_INSTALL_DIR} +) + +FIND_LIBRARY(NEPOMUK_LIBRARIES + NAMES + nepomuk + nepomuk-middleware + PATHS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} +) + +if(NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) + set(Nepomuk_FOUND TRUE) +endif(NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) + +if(Nepomuk_FOUND) + if(NOT Nepomuk_FIND_QUIETLY) + message(STATUS "Found Nepomuk: ${NEPOMUK_LIBRARIES}") + endif(NOT Nepomuk_FIND_QUIETLY) +else(Nepomuk_FOUND) + if(Nepomuk_FIND_REQUIRED) + if(NOT NEPOMUK_INCLUDE_DIR) + message(FATAL_ERROR "Could not find Nepomuk includes.") + endif(NOT NEPOMUK_INCLUDE_DIR) + if(NOT NEPOMUK_LIBRARIES) + message(FATAL_ERROR "Could not find Nepomuk library.") + endif(NOT NEPOMUK_LIBRARIES) + endif(Nepomuk_FIND_REQUIRED) +endif(Nepomuk_FOUND) -- cgit v1.2.1 From bcac74e9c6a6e41c80aac23683c56fcea57aeb10 Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Mon, 11 Jun 2007 21:21:52 +0000 Subject: Improved searching for nepomuk libs svn path=/trunk/KDE/kdelibs/; revision=674148 --- modules/FindNepomuk.cmake | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index dc1d36a7..e01741e7 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -12,16 +12,25 @@ FIND_PATH(NEPOMUK_INCLUDE_DIR PATHS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} -) + ) -FIND_LIBRARY(NEPOMUK_LIBRARIES +FIND_LIBRARY(NEPOMUK_LIBRARY NAMES nepomuk + PATHS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + +FIND_LIBRARY(NEPOMUK_MIDDLEWARE_LIBRARY + NAMES nepomuk-middleware PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} -) + ) + +set(NEPOMUK_LIBRARIES ${NEPOMUK_LIBRARY} ${NEPOMUK_MIDDLEWARE_LIBRARY}) if(NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) set(Nepomuk_FOUND TRUE) -- cgit v1.2.1 From 462a82fbaa136f32f4d119953dd5cd94018f87ab Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Fri, 5 Oct 2007 22:21:25 +0000 Subject: Merge the KConfig branch. This are the 3 main modules (+kdeadmin), which are needed now because friday is the last BC day. The rest of the modules will follow as fast as my laptop allows. svn path=/trunk/KDE/kdelibs/; revision=721704 --- modules/FindNepomuk.cmake | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index e01741e7..c8c4aec5 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -22,15 +22,7 @@ FIND_LIBRARY(NEPOMUK_LIBRARY ${LIB_INSTALL_DIR} ) -FIND_LIBRARY(NEPOMUK_MIDDLEWARE_LIBRARY - NAMES - nepomuk-middleware - PATHS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} - ) - -set(NEPOMUK_LIBRARIES ${NEPOMUK_LIBRARY} ${NEPOMUK_MIDDLEWARE_LIBRARY}) +set(NEPOMUK_LIBRARIES ${NEPOMUK_LIBRARY}) if(NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) set(Nepomuk_FOUND TRUE) -- cgit v1.2.1 From 7dc75baf29c628fddc1f29c1e5fdf41073ac01f4 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 28 Apr 2008 17:49:49 +0000 Subject: major rewrite: - Nepomuk depends on Soprano, so we check for Soprano too, if not already checked for. IOW: you no longer need to check for Soprano separately first in order to successfully use Nepomuk. - use FindPackageHandleStandardArgs() svn path=/trunk/KDE/kdelibs/; revision=802159 --- modules/FindNepomuk.cmake | 79 ++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 36 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index c8c4aec5..1aa42408 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -1,44 +1,51 @@ # Once done this will define # +# Nepomuk requires Soprano, so this module checks for Soprano too. +# # NEPOMUK_FOUND - system has Nepomuk # NEPOMUK_INCLUDE_DIR - the Nepomuk include directory # NEPOMUK_LIBRARIES - Link these to use Nepomuk # NEPOMUK_DEFINITIONS - Compiler switches required for using Nepomuk # -FIND_PATH(NEPOMUK_INCLUDE_DIR - NAMES - nepomuk/resource.h - PATHS - ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} - ) - -FIND_LIBRARY(NEPOMUK_LIBRARY - NAMES - nepomuk - PATHS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} - ) - -set(NEPOMUK_LIBRARIES ${NEPOMUK_LIBRARY}) - -if(NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) - set(Nepomuk_FOUND TRUE) -endif(NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) - -if(Nepomuk_FOUND) - if(NOT Nepomuk_FIND_QUIETLY) - message(STATUS "Found Nepomuk: ${NEPOMUK_LIBRARIES}") - endif(NOT Nepomuk_FIND_QUIETLY) -else(Nepomuk_FOUND) - if(Nepomuk_FIND_REQUIRED) - if(NOT NEPOMUK_INCLUDE_DIR) - message(FATAL_ERROR "Could not find Nepomuk includes.") - endif(NOT NEPOMUK_INCLUDE_DIR) - if(NOT NEPOMUK_LIBRARIES) - message(FATAL_ERROR "Could not find Nepomuk library.") - endif(NOT NEPOMUK_LIBRARIES) - endif(Nepomuk_FIND_REQUIRED) -endif(Nepomuk_FOUND) +if (NOT DEFINED Soprano_FOUND) + macro_optional_find_package(Soprano) + macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" FALSE "" "Soprano is needed for Nepomuk") +endif (NOT DEFINED Soprano_FOUND) + +if (Soprano_FOUND) + + set (NEPOMUK_FIND_REQUIRED ${Nepomuk_FIND_REQUIRED}) + if (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) + + # Already in cache, be silent + set(NEPOMUK_FIND_QUIETLY TRUE) + + else (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) + find_path(NEPOMUK_INCLUDE_DIR + NAMES + nepomuk/resource.h + PATHS + ${KDE4_INCLUDE_DIR} + ${INCLUDE_INSTALL_DIR} + ) + + find_library(NEPOMUK_LIBRARIES + NAMES + nepomuk + PATHS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + + mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES) + + endif (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(NEPOMUK DEFAULT_MSG + NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR) + #to retain backward compatibility + set (Nepomuk_FOUND ${NEPOMUK_FOUND}) + +endif (Soprano_FOUND) -- cgit v1.2.1 From 083ee107ade731c3a0a78f51769d8ed6a959a76d Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 22 May 2008 14:20:39 +0000 Subject: Search nepomuk/global.h which is in kde 4.1 and not in kde 4.0 because some guy has a kde4.0 with headers, but kde4.1 doesn't compile (kdebase/dolphin) with old nepomuk. It will fix check. svn path=/trunk/KDE/kdelibs/; revision=811179 --- modules/FindNepomuk.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index 1aa42408..51cd7549 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -24,7 +24,7 @@ if (Soprano_FOUND) else (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) find_path(NEPOMUK_INCLUDE_DIR NAMES - nepomuk/resource.h + nepomuk/global.h PATHS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} -- cgit v1.2.1 From 87c903a8e853eec433860818a01040da8d1c5f1a Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 4 Jan 2009 15:39:53 +0000 Subject: -add missing copyright notices, I hope I got it right -also a few empty lines here and there to make it look nicer Alex svn path=/trunk/KDE/kdelibs/; revision=905547 --- modules/FindNepomuk.cmake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index 51cd7549..deb0c8c6 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -8,6 +8,13 @@ # NEPOMUK_DEFINITIONS - Compiler switches required for using Nepomuk # + +# Copyright (c) 2008, Sebastian Trueg, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + if (NOT DEFINED Soprano_FOUND) macro_optional_find_package(Soprano) macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" FALSE "" "Soprano is needed for Nepomuk") -- cgit v1.2.1 From 7bc1b84c664e4c89565151cd63f3faae2281b78d Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Tue, 10 Nov 2009 16:27:15 +0000 Subject: Also look for the nepomukquery lib svn path=/trunk/KDE/kdelibs/; revision=1047170 --- modules/FindNepomuk.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index deb0c8c6..d86f0b45 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -5,11 +5,12 @@ # NEPOMUK_FOUND - system has Nepomuk # NEPOMUK_INCLUDE_DIR - the Nepomuk include directory # NEPOMUK_LIBRARIES - Link these to use Nepomuk +# NEPOMUK_QUERY_LIBRARIES - Link these to use Nepomuk query # NEPOMUK_DEFINITIONS - Compiler switches required for using Nepomuk # -# Copyright (c) 2008, Sebastian Trueg, +# Copyright (c) 2008-2009, Sebastian Trueg, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -45,6 +46,14 @@ if (Soprano_FOUND) ${LIB_INSTALL_DIR} ) + find_library(NEPOMUK_QUERY_LIBRARIES + NAMES + nepomukquery + PATHS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES) endif (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) -- cgit v1.2.1 From 408fad1ec96239cfe55cdd3755cf5dbc4fe8e772 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Fri, 13 Nov 2009 16:31:40 +0000 Subject: Make sure the NEPOMUK_QUERY_LIBRARIES are found as well svn path=/trunk/KDE/kdelibs/; revision=1048625 --- modules/FindNepomuk.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index d86f0b45..b406068c 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -24,12 +24,12 @@ endif (NOT DEFINED Soprano_FOUND) if (Soprano_FOUND) set (NEPOMUK_FIND_REQUIRED ${Nepomuk_FIND_REQUIRED}) - if (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) + if (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) # Already in cache, be silent set(NEPOMUK_FIND_QUIETLY TRUE) - else (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) + else (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) find_path(NEPOMUK_INCLUDE_DIR NAMES nepomuk/global.h @@ -56,7 +56,7 @@ if (Soprano_FOUND) mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES) - endif (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES) + endif (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(NEPOMUK DEFAULT_MSG -- cgit v1.2.1 From 0dceb8f7a8c3f8bfcf946d07c864d6178afa315e Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 22 Nov 2009 14:20:16 +0000 Subject: -use HINTS instead of PATHS for searching (directories listed with HINTS are searched before the standard dirs, directories listed after PATHS are searched after the standard dirs) -fix the upper/lower casing of Nepomuk -also call find_package_handle_standard_args() if soprano was not found Alex CCMAIL: svn path=/trunk/KDE/kdelibs/; revision=1052796 --- modules/FindNepomuk.cmake | 69 +++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 38 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index b406068c..bc7e5470 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -23,45 +23,38 @@ endif (NOT DEFINED Soprano_FOUND) if (Soprano_FOUND) - set (NEPOMUK_FIND_REQUIRED ${Nepomuk_FIND_REQUIRED}) - if (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) + find_path(NEPOMUK_INCLUDE_DIR + NAMES + nepomuk/global.h + HINTS + ${KDE4_INCLUDE_DIR} + ${INCLUDE_INSTALL_DIR} + ) + + find_library(NEPOMUK_LIBRARIES + NAMES + nepomuk + HINTS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + + find_library(NEPOMUK_QUERY_LIBRARIES + NAMES + nepomukquery + HINTS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + + mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES) - # Already in cache, be silent - set(NEPOMUK_FIND_QUIETLY TRUE) - - else (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) - find_path(NEPOMUK_INCLUDE_DIR - NAMES - nepomuk/global.h - PATHS - ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} - ) - - find_library(NEPOMUK_LIBRARIES - NAMES - nepomuk - PATHS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} - ) - - find_library(NEPOMUK_QUERY_LIBRARIES - NAMES - nepomukquery - PATHS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} - ) - - mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES) +endif (Soprano_FOUND) - endif (NEPOMUK_INCLUDE_DIR AND NEPOMUK_LIBRARIES AND NEPOMUK_QUERY_LIBRARIES) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Nepomuk DEFAULT_MSG + NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR) - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(NEPOMUK DEFAULT_MSG - NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR) - #to retain backward compatibility - set (Nepomuk_FOUND ${NEPOMUK_FOUND}) +#to retain backward compatibility +set (Nepomuk_FOUND ${NEPOMUK_FOUND}) -endif (Soprano_FOUND) -- cgit v1.2.1 From 62d1e8c500349f3e98e1a9dcb793d6f4de98af1d Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 22 Nov 2009 16:34:29 +0000 Subject: -use find_package() instead of macro_optional_find_package() for soprano inside nepomuk, it doesn't make sense to be able to disable soprano if nepomuk is enabled -also search for the nepomuk stuff if soprano was not found, this makes it possible to have a better error message at the end -also add the soprano variables to the find_package_handle_standard_args() command for better error messagesa Alex CCMAIL: trueg@kde.org svn path=/trunk/KDE/kdelibs/; revision=1052846 --- modules/FindNepomuk.cmake | 69 ++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 33 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index bc7e5470..24832973 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -1,13 +1,13 @@ # Once done this will define # -# Nepomuk requires Soprano, so this module checks for Soprano too. -# # NEPOMUK_FOUND - system has Nepomuk # NEPOMUK_INCLUDE_DIR - the Nepomuk include directory # NEPOMUK_LIBRARIES - Link these to use Nepomuk # NEPOMUK_QUERY_LIBRARIES - Link these to use Nepomuk query # NEPOMUK_DEFINITIONS - Compiler switches required for using Nepomuk # +# Nepomuk requires Soprano, so this module checks for Soprano too. +# # Copyright (c) 2008-2009, Sebastian Trueg, @@ -17,43 +17,46 @@ if (NOT DEFINED Soprano_FOUND) - macro_optional_find_package(Soprano) + find_package(Soprano) + include(MacroLogFeature) macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" FALSE "" "Soprano is needed for Nepomuk") endif (NOT DEFINED Soprano_FOUND) -if (Soprano_FOUND) - - find_path(NEPOMUK_INCLUDE_DIR - NAMES - nepomuk/global.h - HINTS - ${KDE4_INCLUDE_DIR} - ${INCLUDE_INSTALL_DIR} - ) - - find_library(NEPOMUK_LIBRARIES - NAMES - nepomuk - HINTS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} - ) - - find_library(NEPOMUK_QUERY_LIBRARIES - NAMES - nepomukquery - HINTS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} - ) - - mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES) - -endif (Soprano_FOUND) +# Check for the following stuff independent from whether soprano has been found +# or not. This will give a better error message at the end. +find_path(NEPOMUK_INCLUDE_DIR + NAMES + nepomuk/global.h + HINTS + ${KDE4_INCLUDE_DIR} + ${INCLUDE_INSTALL_DIR} + ) + +find_library(NEPOMUK_LIBRARIES + NAMES + nepomuk + HINTS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + +find_library(NEPOMUK_QUERY_LIBRARIES + NAMES + nepomukquery + HINTS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + +mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES) 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) + NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR + Soprano_FOUND SOPRANO_PLUGIN_RAPTORPARSER_FOUND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND + ) #to retain backward compatibility set (Nepomuk_FOUND ${NEPOMUK_FOUND}) -- cgit v1.2.1 From 7ae2155f81e026d49740e844dd6327e3f8a901fe Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Wed, 25 Nov 2009 20:42:54 +0000 Subject: Added macro to find the new shared-desktop-ontologies package svn path=/trunk/KDE/kdelibs/; revision=1054294 --- modules/FindNepomuk.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index 24832973..b9f7b820 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -22,6 +22,12 @@ if (NOT DEFINED Soprano_FOUND) macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" FALSE "" "Soprano is needed for Nepomuk") endif (NOT DEFINED Soprano_FOUND) +if (NOT DEFINED DESKTOP_ONTOLOGIES_FOUND) + find_package(SharedDesktopOntologies) + include(MacroLogFeature) + macro_log_feature(DESKTOP_ONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE "" "Ontologies necessary for the Nepomuk semantic desktop.") +endif (NOT DEFINED DESKTOP_ONTOLOGIES_FOUND) + # Check for the following stuff independent from whether soprano has been found # or not. This will give a better error message at the end. find_path(NEPOMUK_INCLUDE_DIR @@ -55,7 +61,7 @@ include(FindPackageHandleStandardArgs) # 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 + Soprano_FOUND SOPRANO_PLUGIN_RAPTORPARSER_FOUND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND DESKTOP_ONTOLOGIES_FOUND ) #to retain backward compatibility -- cgit v1.2.1 From 3ebe3e49632c59e189b309379ab5928029b3355a Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Fri, 27 Nov 2009 09:25:47 +0000 Subject: Fixed Nepomuk build system including the shared ontologies. Approved by Andreas Pakulat. svn path=/trunk/KDE/kdelibs/; revision=1054973 --- modules/FindNepomuk.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index b9f7b820..8ca6e4f2 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -19,14 +19,14 @@ if (NOT DEFINED Soprano_FOUND) find_package(Soprano) include(MacroLogFeature) - macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" FALSE "" "Soprano is needed for Nepomuk") + macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" TRUE "" "Soprano is needed for Nepomuk") endif (NOT DEFINED Soprano_FOUND) -if (NOT DEFINED DESKTOP_ONTOLOGIES_FOUND) +if (NOT DEFINED SHAREDDESKTOPONTOLOGIES_FOUND) find_package(SharedDesktopOntologies) include(MacroLogFeature) - macro_log_feature(DESKTOP_ONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE "" "Ontologies necessary for the Nepomuk semantic desktop.") -endif (NOT DEFINED DESKTOP_ONTOLOGIES_FOUND) + macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" TRUE "" "Ontologies necessary for the Nepomuk semantic desktop.") +endif (NOT DEFINED SHAREDDESKTOPONTOLOGIES_FOUND) # Check for the following stuff independent from whether soprano has been found # or not. This will give a better error message at the end. @@ -61,7 +61,7 @@ include(FindPackageHandleStandardArgs) # 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 DESKTOP_ONTOLOGIES_FOUND + Soprano_FOUND SOPRANO_PLUGIN_RAPTORPARSER_FOUND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND SHAREDDESKTOPONTOLOGIES_FOUND ) #to retain backward compatibility -- cgit v1.2.1 From bc0afe6c35476c3a7f68ed05d6811cc45b2db9e0 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Mon, 30 Nov 2009 12:18:45 +0000 Subject: Make soprano and sdo optional in FindNepomuk.cmake. If nepomuk is optional, they should not be marked as required. svn path=/trunk/KDE/kdelibs/; revision=1056584 --- modules/FindNepomuk.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index 8ca6e4f2..35b7c4de 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -19,13 +19,13 @@ if (NOT DEFINED Soprano_FOUND) find_package(Soprano) include(MacroLogFeature) - macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" TRUE "" "Soprano is needed for Nepomuk") + macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" FALSE "" "Soprano is needed for Nepomuk") endif (NOT DEFINED Soprano_FOUND) if (NOT DEFINED SHAREDDESKTOPONTOLOGIES_FOUND) find_package(SharedDesktopOntologies) include(MacroLogFeature) - macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" TRUE "" "Ontologies necessary for the Nepomuk semantic desktop.") + macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE "" "Ontologies necessary for the Nepomuk semantic desktop.") endif (NOT DEFINED SHAREDDESKTOPONTOLOGIES_FOUND) # Check for the following stuff independent from whether soprano has been found -- cgit v1.2.1 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/FindNepomuk.cmake') 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 From b83d8f9ce2caf2cef06139e698d2490dc9d36519 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Mon, 28 Dec 2009 17:49:37 +0000 Subject: Make Soprano dependency check nonfatal and thus Nepomuk libs optional. Also updated Soprano URL in FindNepomuk.cmake. To build Nepomuk libs one still needs Soprano >= 2.3.70 with raptor parser and redland storage as well as SDO >= 0.2. CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=1067012 --- modules/FindNepomuk.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index c4768002..fc4a610b 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -19,7 +19,7 @@ if (NOT DEFINED Soprano_FOUND) find_package(Soprano) include(MacroLogFeature) - macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "" FALSE "" "Soprano is needed for Nepomuk") + macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net/" FALSE "" "Soprano is needed for Nepomuk") endif (NOT DEFINED Soprano_FOUND) if (NOT DEFINED SHAREDDESKTOPONTOLOGIES_FOUND) @@ -64,9 +64,9 @@ 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 +# 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 +find_package_handle_standard_args(Nepomuk DEFAULT_MSG NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR NEPOMUK_ADDONTOLOGYCLASSES_FILE Soprano_FOUND SOPRANO_PLUGIN_RAPTORPARSER_FOUND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND SHAREDDESKTOPONTOLOGIES_FOUND -- cgit v1.2.1 From c2c96d0fa3d2d48e1725506bb054d2a6b1b54978 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Tue, 13 Jul 2010 07:07:00 +0000 Subject: - disabled nepomuk backends for wince at this time, because we dont have backend at this time - needs to be fixt in the future svn path=/trunk/KDE/kdelibs/; revision=1149282 --- modules/FindNepomuk.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index fc4a610b..0a24bdb6 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -66,11 +66,20 @@ mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES N include(FindPackageHandleStandardArgs) # List all nepomuk and also all necessary soprano variables here, to make it # easier for the user to see what was missing: +if(NOT WINCE) find_package_handle_standard_args(Nepomuk DEFAULT_MSG NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR NEPOMUK_ADDONTOLOGYCLASSES_FILE Soprano_FOUND SOPRANO_PLUGIN_RAPTORPARSER_FOUND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND SHAREDDESKTOPONTOLOGIES_FOUND ) +else(NOT WINCE) +#FIXME: There are no backends at this time +find_package_handle_standard_args(Nepomuk DEFAULT_MSG + NEPOMUK_LIBRARIES NEPOMUK_INCLUDE_DIR NEPOMUK_ADDONTOLOGYCLASSES_FILE + Soprano_FOUND + SHAREDDESKTOPONTOLOGIES_FOUND + ) +endif(NOT WINCE) #to retain backward compatibility set (Nepomuk_FOUND ${NEPOMUK_FOUND}) -- cgit v1.2.1 From 8d0b6049589aa183ac6791de7baf5aa14195bc3f Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 12 Nov 2010 05:28:18 +0000 Subject: find nepomuk_utils also svn path=/trunk/KDE/kdelibs/; revision=1195844 --- modules/FindNepomuk.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index 0a24bdb6..5a5b20f0 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -4,6 +4,7 @@ # NEPOMUK_INCLUDE_DIR - the Nepomuk include directory # NEPOMUK_LIBRARIES - Link these to use Nepomuk # NEPOMUK_QUERY_LIBRARIES - Link these to use Nepomuk query +# NEPOMUK_UTILS_LIBRARIES - Link these to use Nepomuk utils # NEPOMUK_DEFINITIONS - Compiler switches required for using Nepomuk # # Nepomuk requires Soprano, so this module checks for Soprano too. @@ -54,6 +55,14 @@ find_library(NEPOMUK_QUERY_LIBRARIES ${LIB_INSTALL_DIR} ) +find_library(NEPOMUK_UTILS_LIBRARIES + NAMES + nepomukutils + HINTS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} +) + find_file(NEPOMUK_ADDONTOLOGYCLASSES_FILE NepomukAddOntologyClasses.cmake HINTS ${KDE4_DATA_INSTALL_DIR}/cmake/modules/ PATH_SUFFIXES share/apps/cmake/modules/ @@ -61,7 +70,7 @@ find_file(NEPOMUK_ADDONTOLOGYCLASSES_FILE NepomukAddOntologyClasses.cmake include("${NEPOMUK_ADDONTOLOGYCLASSES_FILE}" OPTIONAL) -mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES NEPOMUK_ADDONTOLOGIES_FILE) +mark_as_advanced(NEPOMUK_INCLUDE_DIR NEPOMUK_LIBRARIES NEPOMUK_QUERY_LIBRARIES NEPOMUK_UTILS_LIBRARIES NEPOMUK_ADDONTOLOGIES_FILE) include(FindPackageHandleStandardArgs) # List all nepomuk and also all necessary soprano variables here, to make it -- cgit v1.2.1 From 9fbdf0074b89a6f0e93b79e7e5ba1648365c97e3 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 15 Nov 2010 22:43:44 +0000 Subject: Apply patch by Romain Perier: make the check for the min soprano version actually work. CCMAIL: kde-buildsystem@kde.org, romain.perier@gmail.com, sebastian@trueg.de svn path=/trunk/KDE/kdelibs/; revision=1197457 --- modules/FindNepomuk.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index 5a5b20f0..c09cf37f 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -18,7 +18,7 @@ if (NOT DEFINED Soprano_FOUND) - find_package(Soprano) + find_package(Soprano ${SOPRANO_MIN_VERSION}) include(MacroLogFeature) macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net/" FALSE "" "Soprano is needed for Nepomuk") endif (NOT DEFINED Soprano_FOUND) -- cgit v1.2.1 From b6f79667180e8cecdc8ceb1b2e853111dbaf2d43 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 19 Nov 2010 00:38:29 +0000 Subject: macro_log_feature's "DESCRIPTION" argument is meant to describe the features the package will provide if found, not describe the package itself (after all, users don't care what some random library _is_, they care what features installing it will provide them with). svn path=/trunk/KDE/kdelibs/; revision=1198576 --- modules/FindNepomuk.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index c09cf37f..b789aec6 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -20,13 +20,13 @@ if (NOT DEFINED Soprano_FOUND) find_package(Soprano ${SOPRANO_MIN_VERSION}) include(MacroLogFeature) - macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net/" FALSE "" "Soprano is needed for Nepomuk") + macro_log_feature(Soprano_FOUND "Soprano" "Support for the Nepomuk semantic desktop system" "http://soprano.sourceforge.net" FALSE "" "") endif (NOT DEFINED Soprano_FOUND) if (NOT DEFINED SHAREDDESKTOPONTOLOGIES_FOUND) find_package(SharedDesktopOntologies) include(MacroLogFeature) - macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE "" "Ontologies necessary for the Nepomuk semantic desktop.") + macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Support for the Nepomuk semantic desktop system" "http://oscaf.sourceforge.net" FALSE "" "") endif (NOT DEFINED SHAREDDESKTOPONTOLOGIES_FOUND) # Check for the following stuff independent from whether soprano has been found -- cgit v1.2.1 From 8f1b33e561944f26465d8fe88b95391b43ba92d8 Mon Sep 17 00:00:00 2001 From: Marijn Kruisselbrink Date: Fri, 19 Nov 2010 20:08:40 +0000 Subject: Search for a different file since nepomuk/global.h is a deprecated header file, and thus not installed when deprecated code is disabled (like in the mobile platform). svn path=/trunk/KDE/kdelibs/; revision=1198801 --- modules/FindNepomuk.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindNepomuk.cmake') diff --git a/modules/FindNepomuk.cmake b/modules/FindNepomuk.cmake index b789aec6..dccc790c 100644 --- a/modules/FindNepomuk.cmake +++ b/modules/FindNepomuk.cmake @@ -33,7 +33,7 @@ endif (NOT DEFINED SHAREDDESKTOPONTOLOGIES_FOUND) # or not. This will give a better error message at the end. find_path(NEPOMUK_INCLUDE_DIR NAMES - nepomuk/global.h + nepomuk/resource.h HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} -- cgit v1.2.1