KDE/kdebase/runtime

[Andreas Pakulat]

SVN commit 1113683 by apaku:

Fix finding SDO.

kdebase couldn't be compiled, complaining about missing function/classes in a
namespace. It took me 30 minutes to find out that:
a) the files where this is are generated
b) the source files are from a too-old SDO version

The problem is that the check only lists SDO as an optional package that
couldn't be found, but still tries to build the nepomuk stuff. So either the
nepomuk stuff needs to be disabled if SDO is not found, or SDO needs to be a
requirement. This was just the easier fix for now, hence cc'ing kde-buildsystem
so a proper decision can be done which fix is the right one.

CCMAIL: kde-buildsystem at kde.org



 M  +1 -1      CMakeLists.txt  


--- trunk/KDE/kdebase/runtime/CMakeLists.txt #1113682:1113683
@@ -18,7 +18,7 @@
 
 set(SOPRANO_MIN_VERSION "2.3.70")
 set(SDO_MIN_VERSION "0.3.60")
-macro_optional_find_package(SharedDesktopOntologies ${SDO_MIN_VERSION})
+macro_optional_find_package(SharedDesktopOntologies ${SDO_MIN_VERSION} REQUIRED)
 macro_optional_find_package(Nepomuk)
 macro_log_feature(SHAREDDESKTOPONTOLOGIES_FOUND "Shared desktop ontologies" "Desktop ontologies" "http://oscaf.sourceforge.net" FALSE ${SDO_MIN_VERSION} "Ontologies necessary for the Nepomuk semantic desktop.")
 macro_log_feature(Nepomuk_FOUND "Nepomuk" "Nepomuk Libraries" "kdelibs" FALSE "" "Required to build Nepomuk.")