[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/pim/krss
From:       Dmitry Ivanov <vonami () gmail ! com>
Date:       2009-07-18 19:53:51
Message-ID: 1247946831.642114.5781.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 998971 by divanov:

Bye-bye, playground! (but lets keep krssreader in here just in case)


 M  +9 -12     CMakeLists.txt  
 D             cmake/modules/CMakeLists.txt  
 D             cmake/modules/FindProtocolBuffers.cmake  
 M  +2 -2      krssreader/importitemsjob.cpp  
 M  +1 -1      krssreader/main.cpp  
 M  +15 -15    krssreader/mainwidget.cpp  
 M  +1 -1      krssreader/mainwidget.h  
 M  +5 -5      krssreader/migratefeedscommand.cpp  
 D             libkrss (directory)  
 D             plugin (directory)  
 D             resources (directory)  


--- trunk/playground/pim/krss/CMakeLists.txt #998970:998971
@@ -1,26 +1,23 @@
 project(krss)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 find_package(KDE4 REQUIRED)
 find_package(KdepimLibs REQUIRED)
 find_package(Boost REQUIRED)
 include (KDE4Defaults)
 
-if (KRSS_ENABLE_PROTOBUF_SERIALIZER)
-    find_package(ProtocolBuffers REQUIRED)
-    add_definitions( -DKRSS_ENABLE_PROTOBUF_SERIALIZER)
-    include_directories( ${PROTOBUF_INCLUDE_DIR} )
-endif (KRSS_ENABLE_PROTOBUF_SERIALIZER)
+macro_optional_find_package(LibKRSS)
+macro_log_feature(LIBKRSS_FOUND "libkrss" "KRSS library"
+                  "svn://anonsvn.kde.org/home/kde/branches/work/akonadi-ports/kdepim/krss" \
FALSE "" +                  "KRSS provides RSS support for Akonadi (required to build \
demo applications)")  
 include_directories( ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} \
                ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS}
-                     ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/libkrss )
+                     ${QT_INCLUDES})
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
-add_subdirectory(libkrss)
-add_subdirectory(resources)
-add_subdirectory(plugin)
-add_subdirectory(krssreader)
-add_subdirectory(cmake/modules)
+if (LIBKRSS_FOUND)
+  macro_optional_add_subdirectory(krssreader)
+endif (LIBKRSS_FOUND)
--- trunk/playground/pim/krss/krssreader/importitemsjob.cpp #998970:998971
@@ -22,8 +22,8 @@
 
 #include "importitemsjob.h"
 
-#include "libkrss/importitemsjob.h"
-#include "libkrss/resource.h"
+#include <krss/importitemsjob.h>
+#include <krss/resource.h>
 
 #include <KDebug>
 #include <KLocalizedString>
--- trunk/playground/pim/krss/krssreader/main.cpp #998970:998971
@@ -17,7 +17,7 @@
 
 #include "mainwindow.h"
 
-#include "libkrss/resourcemanager.h"
+#include <krss/resourcemanager.h>
 
 #include <kapplication.h>
 #include <kaboutdata.h>
--- trunk/playground/pim/krss/krssreader/mainwidget.cpp #998970:998971
@@ -19,21 +19,21 @@
 #include "importitemsjob.h"
 #include "migratefeedscommand.h"
 
-#include "libkrss/itemjobs.h"
-#include "libkrss/itemlisting.h"
-#include "libkrss/itemlistjob.h"
-#include "libkrss/itemmodel.h"
-#include "libkrss/ui/itemview.h"
-#include "libkrss/feedlist.h"
-#include "libkrss/feedlistmodel.h"
-#include "libkrss/ui/feedlistview.h"
-#include "libkrss/netfeed.h"
-#include "libkrss/resource.h"
-#include "libkrss/resourcemanager.h"
-#include "libkrss/standardactionmanager.h"
-#include "libkrss/tagprovider.h"
-#include "libkrss/importopmljob.h"
-#include "libkrss/treenodevisitor.h"
+#include <krss/itemjobs.h>
+#include <krss/itemlisting.h>
+#include <krss/itemlistjob.h>
+#include <krss/itemmodel.h>
+#include <krss/ui/itemview.h>
+#include <krss/feedlist.h>
+#include <krss/feedlistmodel.h>
+#include <krss/ui/feedlistview.h>
+#include <krss/netfeed.h>
+#include <krss/resource.h>
+#include <krss/resourcemanager.h>
+#include <krss/standardactionmanager.h>
+#include <krss/tagprovider.h>
+#include <krss/importopmljob.h>
+#include <krss/treenodevisitor.h>
 
 #include <akonadi/itemfetchscope.h>
 
--- trunk/playground/pim/krss/krssreader/mainwidget.h #998970:998971
@@ -20,7 +20,7 @@
 
 #include <QtCore/QPointer>
 #include <QtGui/QWidget>
-#include "libkrss/treenode.h"
+#include <krss/treenode.h>
 
 #include <boost/shared_ptr.hpp>
 
--- trunk/playground/pim/krss/krssreader/migratefeedscommand.cpp #998970:998971
@@ -24,11 +24,11 @@
 #include "migratefeedswizard_p.h"
 #include "importitemsjob.h"
 
-#include "libkrss/importopmljob.h"
-#include "libkrss/resource.h"
-#include "libkrss/feedlist.h"
-#include "libkrss/netfeed.h"
-#include "libkrss/resourcemanager.h"
+#include <krss/importopmljob.h>
+#include <krss/resource.h>
+#include <krss/feedlist.h>
+#include <krss/netfeed.h>
+#include <krss/resourcemanager.h>
 
 #include <akonadi/agentinstance.h>
 #include <akonadi/agentinstancecreatejob.h>


[prev in list] [next in list] [prev in thread] [next in thread]