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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/plugins
From:       Volker Krause <vkrause () kde ! org>
Date:       2008-03-21 13:40:22
Message-ID: 1206106822.156770.24809.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 788386 by vkrause:

Build with Akonadi from kdepimlibs. Some tests still fail because of
accessing itemserializer.h which is internal.


 M  +4 -5      CMakeLists.txt  
 M  +1 -1      akonadi_serializer_addressee.cpp  
 M  +1 -1      akonadi_serializer_addressee.h  
 M  +1 -1      akonadi_serializer_bookmark.cpp  
 M  +1 -1      akonadi_serializer_bookmark.h  
 M  +1 -1      akonadi_serializer_kcal.cpp  
 M  +1 -1      akonadi_serializer_kcal.h  
 M  +2 -2      akonadi_serializer_mail.cpp  
 M  +1 -1      akonadi_serializer_mail.h  
 M  +2 -2      tests/itemserializertest.cpp  
 M  +2 -2      tests/mailserializerplugintest.cpp  


--- trunk/KDE/kdepim/akonadi/plugins/CMakeLists.txt #788385:788386
@@ -1,7 +1,6 @@
 add_subdirectory( tests )
 
 include_directories(
-        ${CMAKE_SOURCE_DIR}/akonadi
         ${Boost_INCLUDE_DIR}
 )
 
@@ -10,22 +9,22 @@
 
 set(akonadi_serializer_addressee_PART_SRCS akonadi_serializer_addressee.cpp )
 kde4_add_plugin(akonadi_serializer_addressee \
                ${akonadi_serializer_addressee_PART_SRCS})
-target_link_libraries(akonadi_serializer_addressee ${KDE4_KDECORE_LIBS} \
${KDE4_KABC_LIBS} akonadicore) +target_link_libraries(akonadi_serializer_addressee \
${KDE4_KDECORE_LIBS} ${KDE4_KABC_LIBS} ${AKONADI_LIBS} akonadiprotocolinternals)  \
install(TARGETS akonadi_serializer_addressee DESTINATION ${PLUGIN_INSTALL_DIR})  
 set(akonadi_serializer_mail_PART_SRCS akonadi_serializer_mail.cpp )
 kde4_add_plugin(akonadi_serializer_mail ${akonadi_serializer_mail_PART_SRCS})
-target_link_libraries(akonadi_serializer_mail ${KDE4_KDECORE_LIBS} \
${KDE4_KMIME_LIBS} akonadicore) +target_link_libraries(akonadi_serializer_mail \
${KDE4_KDECORE_LIBS} ${KDE4_KMIME_LIBS} ${AKONADI_LIBS} akonadiprotocolinternals)  \
install(TARGETS akonadi_serializer_mail DESTINATION ${PLUGIN_INSTALL_DIR})  
 set(akonadi_serializer_kcal_SRCS akonadi_serializer_kcal.cpp)
 kde4_add_plugin(akonadi_serializer_kcal ${akonadi_serializer_kcal_SRCS})
-target_link_libraries(akonadi_serializer_kcal ${KDE4_KDECORE_LIBS} ${KDE4_KCAL_LIBS} \
akonadicore) +target_link_libraries(akonadi_serializer_kcal ${KDE4_KDECORE_LIBS} \
${KDE4_KCAL_LIBS} ${AKONADI_LIBS} akonadiprotocolinternals)  install(TARGETS \
akonadi_serializer_kcal DESTINATION ${PLUGIN_INSTALL_DIR})  
 set(akonadi_serializer_bookmark_SRCS akonadi_serializer_bookmark.cpp)
 kde4_add_plugin(akonadi_serializer_bookmark ${akonadi_serializer_bookmark_SRCS})
-target_link_libraries(akonadi_serializer_bookmark ${KDE4_KDECORE_LIBS} \
${KDE4_BOOKMARK_LIBS} akonadicore) +target_link_libraries(akonadi_serializer_bookmark \
${KDE4_KDECORE_LIBS} ${KDE4_BOOKMARK_LIBS} ${AKONADI_LIBS} akonadiprotocolinternals)  \
install(TARGETS akonadi_serializer_bookmark DESTINATION ${PLUGIN_INSTALL_DIR})  
 ########### install files ###############
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_addressee.cpp #788385:788386
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 
-#include <libakonadi/item.h>
+#include <akonadi/item.h>
 
 using namespace Akonadi;
 
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_addressee.h #788385:788386
@@ -20,7 +20,7 @@
 #ifndef __AKONADI_SERIALIZER_ADDRESSEE_H__
 #define __AKONADI_SERIALIZER_ADDRESSEE_H__
 
-#include <libakonadi/itemserializerplugin.h>
+#include <akonadi/itemserializerplugin.h>
 #include <kabc/vcardconverter.h>
 
 namespace Akonadi {
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_bookmark.cpp #788385:788386
@@ -23,7 +23,7 @@
 #include <QMimeData>
 #include <kbookmark.h>
 
-#include <libakonadi/item.h>
+#include <akonadi/item.h>
 
 
 using namespace Akonadi;
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_bookmark.h #788385:788386
@@ -20,7 +20,7 @@
 #ifndef __AKONADI_SERIALIZER_BOOKMARK_H__
 #define __AKONADI_SERIALIZER_BOOKMARK_H__
 
-#include <libakonadi/itemserializerplugin.h>
+#include <akonadi/itemserializerplugin.h>
 
 class QIODevice;
 class QString;
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_kcal.cpp #788385:788386
@@ -19,7 +19,7 @@
 
 #include "akonadi_serializer_kcal.h"
 
-#include <libakonadi/item.h>
+#include <akonadi/item.h>
 #include <kdebug.h>
 #include <boost/shared_ptr.hpp>
 
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_kcal.h #788385:788386
@@ -20,7 +20,7 @@
 #ifndef AKONADI_SERIALIZER_KCAL_H
 #define AKONADI_SERIALIZER_KCAL_H
 
-#include <libakonadi/itemserializerplugin.h>
+#include <akonadi/itemserializerplugin.h>
 #include <kcal/icalformat.h>
 
 namespace Akonadi {
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_mail.cpp #788385:788386
@@ -23,8 +23,8 @@
 #include <kmime/kmime_message.h>
 #include <boost/shared_ptr.hpp>
 
-#include "../libakonadi/item.h"
-#include "../libakonadi/imapparser.h"
+#include <akonadi/item.h>
+#include <akonadi/private/imapparser.h>
 
 using namespace Akonadi;
 using namespace KMime;
--- trunk/KDE/kdepim/akonadi/plugins/akonadi_serializer_mail.h #788385:788386
@@ -21,7 +21,7 @@
 #ifndef __AKONADI_SERIALIZER_MAIL_H__
 #define __AKONADI_SERIALIZER_MAIL_H__
 
-#include <libakonadi/itemserializerplugin.h>
+#include <akonadi/itemserializerplugin.h>
 
 namespace Akonadi {
 
--- trunk/KDE/kdepim/akonadi/plugins/tests/itemserializertest.cpp #788385:788386
@@ -19,8 +19,8 @@
 
 #include "itemserializertest.h"
 
-#include <libakonadi/item.h>
-#include <libakonadi/itemserializer.h>
+#include <akonadi/item.h>
+#include <akonadi/itemserializer.h>
 
 #include <qtest_kde.h>
 
--- trunk/KDE/kdepim/akonadi/plugins/tests/mailserializerplugintest.cpp \
#788385:788386 @@ -19,8 +19,8 @@
 
 #include "mailserializerplugintest.h"
 
-#include <libakonadi/item.h>
-#include <libakonadi/itemserializer.h>
+#include <akonadi/item.h>
+#include <akonadi/itemserializer.h>
 #include <kmime/kmime_message.h>
 #include <boost/shared_ptr.hpp>
 


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