From kde-commits  Fri Feb 25 19:35:57 2011
From: Sebastian Trueg <sebastian () trueg ! de>
Date: Fri, 25 Feb 2011 19:35:57 +0000
To: kde-commits
Subject: playground/base/nepomuk-kde/annotation
Message-Id: <20110225193557.C94AEAC8C3 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129866258925242

SVN commit 1222751 by trueg:

Added cmake check for Scribo and used correct includes

 M  +1 -3      lib/CMakeLists.txt  
 M  +7 -1      plugins/CMakeLists.txt  
 M  +2 -3      plugins/scribo/CMakeLists.txt  
 M  +1 -1      plugins/scribo/eventannotation.cpp  
 M  +2 -2      plugins/scribo/eventannotation.h  
 M  +4 -4      plugins/scribo/scriboannotationplugin.cpp  


--- trunk/playground/base/nepomuk-kde/annotation/lib/CMakeLists.txt #1222750:1222751
@@ -7,12 +7,10 @@
   ${KDE4_INCLUDES}
   ${SOPRANO_INCLUDE_DIR}
   ${NEPOMUK_INCLUDE_DIR}
+  ${NEPOMUKEXTRAS_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/gui
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${nepomukextras_SOURCE_DIR}
-  ${nepomuk_kde_SOURCE_DIR}/misc
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../usercontext/lib
 )
 
 set( corelib_SRCS
--- trunk/playground/base/nepomuk-kde/annotation/plugins/CMakeLists.txt #1222750:1222751
@@ -7,16 +7,22 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/common
 )
 
+find_package(Scribo)
+macro_log_feature(SCRIBO_FOUND "Scribo" "Natural language processing for KDE" "scribo" FALSE "" "Required for natural language processing.")
+
 add_subdirectory(pimo)
 add_subdirectory(propertycreation)
 add_subdirectory(pimotype)
 add_subdirectory(tags)
 add_subdirectory(webpage)
 add_subdirectory(geonames)
-add_subdirectory(scribo)
 add_subdirectory(dbpedia)
 add_subdirectory(context)
 
+if(SCRIBO_FOUND)
+  add_subdirectory(scribo)
+endif()
+
 # NCO
 #kde4_add_plugin(nepomuk_ncoannotationplugin nco.cpp)
 #target_link_libraries(nepomuk_ncoannotationplugin
--- trunk/playground/base/nepomuk-kde/annotation/plugins/scribo/CMakeLists.txt #1222750:1222751
@@ -9,7 +9,7 @@
   ${NEPOMUK_INCLUDE_DIR}
   ${NEPOMUK_INCLUDE_DIR}/nepomuk
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${libscribo_SOURCE_DIR}
+  ${SCRIBO_INCLUDE_DIR}
   ${nepomukannotation_SOURCE_DIR}
 )
 
@@ -26,9 +26,8 @@
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
   ${SCRIBO_LIBRARIES}
+  ${NEPOMUKEXTRAS_LIBRARIES}
   nepomukannotation
-  nepomukextras
-  scribo
 )
 install(TARGETS nepomuk_scriboannotationplugin DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES nepomuk_scriboannotationplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/nepomukannotationplugins)
--- trunk/playground/base/nepomuk-kde/annotation/plugins/scribo/eventannotation.cpp #1222750:1222751
@@ -18,7 +18,6 @@
 
 #include "eventannotation.h"
 #include "simpleannotation.h"
-#include "pimo.h"
 #include "resourceeditor.h"
 
 #include <KGlobal>
@@ -29,6 +28,7 @@
 #include <Nepomuk/Types/Property>
 #include <Nepomuk/Variant>
 #include <Nepomuk/Thing>
+#include <Nepomuk/Vocabulary/PIMO>
 
 
 Nepomuk::EventAnnotation::EventAnnotation( QObject* parent )
--- trunk/playground/base/nepomuk-kde/annotation/plugins/scribo/eventannotation.h #1222750:1222751
@@ -20,8 +20,8 @@
 #define _NEPOMUK_EVENT_ANNOTATION_H_
 
 #include "textannotation.h"
-#include "statement.h"
-#include "entity.h"
+#include <scribo/statement.h>
+#include <scribo/entity.h>
 
 #include <QtCore/QList>
 
--- trunk/playground/base/nepomuk-kde/annotation/plugins/scribo/scriboannotationplugin.cpp #1222750:1222751
@@ -25,10 +25,10 @@
 
 #include "nie.h"
 
-#include "textmatcher.h"
-#include "textmatch.h"
-#include "textoccurrence.h"
-#include "entity.h"
+#include <scribo/textmatcher.h>
+#include <scribo/textmatch.h>
+#include <scribo/textoccurrence.h>
+#include <scribo/entity.h>
 
 #include "tagannotation.h"
 #include "simpleannotation.h"