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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/resources
From:       Christophe Giboudeaux <cgiboudeaux () gmail ! com>
Date:       2009-06-16 17:16:54
Message-ID: 1245172614.776871.21639.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 982714 by cgiboudeaux:

Use libkdepim-copy. the previous 'kdepim' link target was renamed kdepim-copy and the \
korganizer/version.h include was replaced

 M  +3 -2      CMakeLists.txt  
 M  +1 -2      imap/CMakeLists.txt  
 M  +1 -1      kolabproxy/CMakeLists.txt  
 M  +3 -1      kolabproxy/incidence.cpp  
 M  +3 -1      kolabproxy/journal.cpp  


--- trunk/KDE/kdepim/akonadi/resources/CMakeLists.txt #982713:982714
@@ -1,5 +1,6 @@
 
 include_directories(
+  ${kdepim-runtime_SOURCE_DIR}/libkdepim-copy
   ${CMAKE_CURRENT_SOURCE_DIR}/shared
   ${CMAKE_CURRENT_BINARY_DIR}/shared
 )
@@ -26,11 +27,11 @@
 add_subdirectory( birthdays )
 add_subdirectory( distlist )
 add_subdirectory( ical )
-add_subdirectory( imap ) # REQ: libkdepim
+add_subdirectory( imap )
 add_subdirectory( kabc )
 add_subdirectory( kcal )
 add_subdirectory( knut )
-add_subdirectory( kolabproxy ) # REQ: libkdepim/distributionlist.h
+add_subdirectory( kolabproxy )
 add_subdirectory( localbookmarks )
 add_subdirectory( maildir )
 add_subdirectory( mbox )
--- trunk/KDE/kdepim/akonadi/resources/imap/CMakeLists.txt #982713:982714
@@ -1,5 +1,4 @@
 include_directories(
-    ${CMAKE_SOURCE_DIR}
     ${kdepim-runtime_SOURCE_DIR}
     ${QT_QTDBUS_INCLUDE_DIR}
     ${Boost_INCLUDE_DIR}
@@ -37,7 +36,7 @@
 kde4_add_kcfg_files(imapresource_SRCS settingsbase.kcfgc)
 kde4_add_executable(akonadi_imap_resource RUN_UNINSTALLED ${imapresource_SRCS})
 
-target_link_libraries(akonadi_imap_resource ${KDEPIMLIBS_AKONADI_LIBS} \
${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} \
${KDEPIMLIBS_KIMAP_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDE4_SOLID_LIBS} \
${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} kdepim) \
+target_link_libraries(akonadi_imap_resource ${KDEPIMLIBS_AKONADI_LIBS} \
${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} \
${KDEPIMLIBS_KIMAP_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDE4_SOLID_LIBS} \
${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} kdepim-copy)  
 install(TARGETS akonadi_imap_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/KDE/kdepim/akonadi/resources/kolabproxy/CMakeLists.txt #982713:982714
@@ -40,7 +40,7 @@
 
 kde4_add_executable(akonadi_kolabproxy_resource RUN_UNINSTALLED \
${kolabproxyresource_SRCS})  
-target_link_libraries(akonadi_kolabproxy_resource ${KDEPIMLIBS_AKONADI_LIBS} \
${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} \
${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} \
${KDEPIMLIBS_KMIME_LIBS} kdepim) +target_link_libraries(akonadi_kolabproxy_resource \
${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} \
${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KABC_LIBS} ${KDEPIMLIBS_KCAL_LIBS} \
${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_KMIME_LIBS} kdepim-copy)  
 install(TARGETS akonadi_kolabproxy_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/KDE/kdepim/akonadi/resources/kolabproxy/incidence.cpp #982713:982714
@@ -32,16 +32,18 @@
 */
 
 #include "incidence.h"
+#include "kdepim-version.h"
 
 #include <QFile>
 #include <QList>
 
 #include <kcal/journal.h>
-#include <korganizer/version.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kio/netaccess.h>
 
+static const char korgVersion[] = KDEPIM_VERSION;
+
 using namespace Kolab;
 
 
--- trunk/KDE/kdepim/akonadi/resources/kolabproxy/journal.cpp #982713:982714
@@ -32,11 +32,13 @@
 */
 
 #include "journal.h"
+#include "kdepim-version.h"
 
 #include <kcal/journal.h>
-#include <korganizer/version.h>
 #include <kdebug.h>
 
+static const char korgVersion[] = KDEPIM_VERSION;
+
 using namespace Kolab;
 
 


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