KDE/kdelibs

[Maciej Mrozowski]

SVN commit 1067012 by mmrozowski:

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 at kde.org

 M  +4 -4      CMakeLists.txt  
 M  +3 -3      cmake/modules/FindNepomuk.cmake  


--- trunk/KDE/kdelibs/CMakeLists.txt #1067011:1067012
@@ -94,7 +94,7 @@
 macro_log_feature(OPENGL_FOUND "OpenGL" "API for developing portable, interactive 2D and 3D graphics applications" "http://mesa3d.sourceforge.net" FALSE "" "STRONGLY RECOMMENDED: The 3D hardware acceleration available through the OpenGL API is used in applications ranging from graphics and modellers to screensavers and video players.")
 
 set(SOPRANO_MIN_VERSION "2.3.70")
-find_package(Soprano  REQUIRED COMPONENTS  PLUGIN_RAPTORPARSER PLUGIN_REDLANDBACKEND)
+macro_optional_find_package(Soprano COMPONENTS PLUGIN_RAPTORPARSER PLUGIN_REDLANDBACKEND)
 macro_log_feature(SOPRANO_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net" FALSE "${SOPRANO_MIN_VERSION}" "Provide metadata support (for semantic desktop).")
 macro_log_feature(SOPRANO_PLUGIN_RAPTORPARSER_FOUND "Soprano Raptor Parser" "RDF parser plugin for Soprano" "http://soprano.sourceforge.net" FALSE "" "The Soprano raptor parser plugin is required to build the Nepomuk semantic desktop system.")
 macro_log_feature(SOPRANO_PLUGIN_REDLANDBACKEND_FOUND "Soprano Redland Backend" "Redland storage backend for Soprano" "http://soprano.sourceforge.net" FALSE "" "The Soprano redland backend is required to build the Nepomuk semantic desktop system.")
@@ -190,7 +190,7 @@
                       ${CMAKE_SOURCE_DIR}/kio/kfile
                       ${KDE4_KDEUI_INCLUDES})
 
-# kpty 
+# kpty
 set(KDE4_KPTY_INCLUDES ${CMAKE_SOURCE_DIR}/kpty ${KDE4_KIO_INCLUDES} )
 
 # kparts depends on kio
@@ -298,14 +298,14 @@
 # configuration specific export files KDELibs4(Library|Tools)Targets-<config>.cmake
 # if the main exports file KDELibs4(Library|Tools)Targets.cmake has changed. This makes sure
 # that this main file doesn't include older and different configuration specific exports files,
-# which might have a different set of targets or targets with different names. 
+# which might have a different set of targets or targets with different names.
 # The code for installing the exports files will soon go into a macro. Alex
 install(CODE "set(EXPORT_FILES KDELibs4LibraryTargets.cmake KDELibs4ToolsTargets.cmake)"
         CODE "set(EXPORT_INSTALL_DIR \"${DATA_INSTALL_DIR}/cmake/modules\")"
         SCRIPT "${CMAKE_SOURCE_DIR}/cmake/modules/check_installed_exports_file.cmake" )
 install( EXPORT kdelibsLibraryTargets DESTINATION ${DATA_INSTALL_DIR}/cmake/modules NAMESPACE ${KDE4_TARGET_PREFIX} FILE KDELibs4LibraryTargets.cmake )
 install( EXPORT kdelibsToolsTargets   DESTINATION ${DATA_INSTALL_DIR}/cmake/modules NAMESPACE ${KDE4_TARGET_PREFIX} FILE KDELibs4ToolsTargets.cmake )
-# the following will be the correct locations once cmake has the improved FIND_PACKAGE() 
+# the following will be the correct locations once cmake has the improved FIND_PACKAGE()
 # install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake DESTINATION ${PLUGIN_INSTALL_DIR}/cmake RENAME KDE4Config.cmake)
 
 macro_optional_add_subdirectory( experimental )
--- trunk/KDE/kdelibs/cmake/modules/FindNepomuk.cmake #1067011:1067012
@@ -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 @@
 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