KDE/kdelibs

[Sebastian Trueg]

Well, I see now that my action was not the greatest. I apologize.
However, disabling Nepomuk altogether is not a solution either. What is
so broken about the cmake file anyway? "not in an acceptable state" does
not tell me anything.
I am more than willing to improve the situation.

Cheers,
Sebastian

Alexander Neundorf wrote:
> SVN commit 1054396 by neundorf:
> 
> Revert the new cmake module committed without any review or announcement and which was in a broken state.
> 
> This has the effect that the condition for building nepomuk is now never true (instead of sometimes), but 
> I have the impression that for successfully building all of KDE nepomuk is always required, since the nepomuk/trig parsing is
> also used e.g. in kdepim and I think also in kdenetwork. 
> So the behaviour was already wrong, and now it is more exposed. This should help getting it fixed.
> 
> Also, this commit makes explicit that soprano with redland backend and raptorparser are in fact required for building KDE since last week.
> 
> Alex
> 
> CCMAIL: trueg at kde.org
> CCMAIL: kde-buildsystem at kde.org
> CCMAIL: kde-core-devel at kde.org
> 
> 
> 
>  M  +9 -6      CMakeLists.txt  
>  M  +3 -35     cmake/modules/FindSharedDesktopOntologies.cmake  
> 
> 
> --- trunk/KDE/kdelibs/CMakeLists.txt #1054395:1054396
> @@ -90,13 +90,14 @@
>  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")
> -macro_optional_find_package(Soprano)
> -macro_optional_find_package(SharedDesktopOntologies)
> -macro_log_feature(DESKTOP_ONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE "" "Ontologies necessary for the Nepomuk semantic desktop.")
> -macro_log_feature(Soprano_FOUND "Soprano" "Semantic Desktop Storing" "http://soprano.sourceforge.net" FALSE "${SOPRANO_MIN_VERSION}" "Provide metadata support (for semantic desktop).")
> +find_package(Soprano  REQUIRED 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.")
>  
> +macro_optional_find_package(SharedDesktopOntologies)
> +macro_log_feature(DESKTOP_ONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE "" "Ontologies necessary for the Nepomuk semantic desktop.")
> +
>  macro_optional_find_package(QCA2)
>  macro_log_feature(QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" "http://delta.affinix.com/qca" FALSE "2.0.0" "Needed for the plasma remote widgets functionality.")
>  
> @@ -224,10 +225,12 @@
>  check_library_exists(socket connect "" HAVE_SOCKET_LIBRARY)
>  
>  
> -if(Soprano_FOUND AND SOPRANO_PLUGIN_RAPTORPARSER_FOUND AND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND AND DESKTOP_ONTOLOGIES_FOUND)
> +# Actually nepomuk is not optional, without it other KDE modules don't build,
> +# so this must be fixed. Alex
> +if(DESKTOP_ONTOLOGIES_FOUND)
>    set(HAVE_NEPOMUK true)
>    add_subdirectory(nepomuk)
> -endif(Soprano_FOUND AND SOPRANO_PLUGIN_RAPTORPARSER_FOUND AND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND AND DESKTOP_ONTOLOGIES_FOUND)
> +endif(DESKTOP_ONTOLOGIES_FOUND)
>  
>  ################# list the subdirectories #################
>  
> --- trunk/KDE/kdelibs/cmake/modules/FindSharedDesktopOntologies.cmake #1054395:1054396
> @@ -1,36 +1,4 @@
> -# - Try to find shared-desktop-ontologies
> -# Once done this will define
> -#
> -#  DESKTOP_ONTOLOGIES_FOUND - system has shared-desktop-ontologies
> -#  DESKTOP_ONTOLOGIES_DIR - Folder where the ontologies are stored
> -#  DESKTOP_ONTOLOGIES_VERSION - version number of shared-desktop-ontologies
> +# This module was committed without any review or announcement and in a not acceptable state, so disable it for now. Alex
> +message(STATUS "FindSharedDesktopOntologies.cmake is just a placeholder until a reviewed module is committed")
>  
> -# Copyright (c) 2009, Sebastian Trueg, <trueg at kde.org>
> -#
> -# Redistribution and use is allowed according to the terms of the BSD license.
> -# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
> -
> -IF (DESKTOP_ONTOLOGIES_DIR)
> -   # in cache already
> -   SET(SharedDesktopOntologies_FIND_QUIETLY TRUE)
> -ENDIF (DESKTOP_ONTOLOGIES_DIR)
> -
> -IF (NOT WIN32)
> -   # use pkg-config to get the directories and then use these values
> -   # in the FIND_PATH() and FIND_LIBRARY() calls
> -   find_package(PkgConfig)
> -   PKG_SEARCH_MODULE( DESKTOP_ONTOLOGIES shared-desktop-ontologies )
> -   set(DESKTOP_ONTOLOGIES_DIR ${DESKTOP_ONTOLOGIES_PREFIX}/share/ontology)
> -ENDIF (NOT WIN32)
> -
> -IF (DESKTOP_ONTOLOGIES_FOUND)
> -   IF (NOT SharedDesktopOntologies_FIND_QUIETLY)
> -      MESSAGE(STATUS "Found SharedDesktopOntologies ${DESKTOP_ONTOLOGIES_VERSION}: ${DESKTOP_ONTOLOGIES_DIR}")
> -   ENDIF (NOT SharedDesktopOntologies_FIND_QUIETLY)
> -ELSE (DESKTOP_ONTOLOGIES_FOUND)
> -   IF (SharedDesktopOntologies_FIND_REQUIRED)
> -      MESSAGE(FATAL_ERROR "Could NOT find SharedDesktopOntologies, check FindPkgConfig output above!")
> -   ENDIF (SharedDesktopOntologies_FIND_REQUIRED)
> -ENDIF (DESKTOP_ONTOLOGIES_FOUND)
> -
> -MARK_AS_ADVANCED(DESKTOP_ONTOLOGIES_DIR)
> +set(DESKTOP_ONTOLOGIES_DIR "")
>