Commit a333cca6 authored by Laurent Montel's avatar Laurent Montel 😁

Make kolab resource linking with pimkolab

parent 81c87857
......@@ -2,10 +2,6 @@
find_package(Xsltproc)
set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
# Libkolab
find_package(Libkolab 1.0 QUIET CONFIG)
set_package_properties(Libkolab PROPERTIES DESCRIPTION "libkolab" URL "http://mirror.kolabsys.com/pub/releases" TYPE OPTIONAL PURPOSE "The Kolab Format libraries are required to build the Kolab Groupware Resource")
# Libkolabxml
find_package(Libkolabxml 1.1 QUIET CONFIG)
set_package_properties(Libkolabxml PROPERTIES DESCRIPTION "Kolabxml" URL "http://mirror.kolabsys.com/pub/releases" TYPE OPTIONAL PURPOSE "The Kolab XML Format Schema Definitions Library is required to build the Kolab Groupware Resource")
......@@ -46,7 +42,7 @@ add_subdirectory( contacts )
add_subdirectory( dav )
add_subdirectory( ical )
add_subdirectory( imap )
if (Libkolab_FOUND AND Libkolabxml_FOUND)
if (Libkolabxml_FOUND)
add_subdirectory( kolab )
endif()
add_subdirectory( facebook )
......
add_subdirectory(libkolab)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../imap
${CMAKE_CURRENT_BINARY_DIR}/../imap
${CMAKE_CURRENT_SOURCE_DIR}/libkolab/
${Libkolabxml_INCLUDES}
${Libkolab_INCLUDES}
)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
......@@ -52,7 +53,7 @@ target_link_libraries(akonadi_kolab_resource
KF5::IdentityManagement
imapresource
folderarchivesettings
${Libkolab_LIBRARIES}
pimkolab
KF5::Contacts
KF5::CalendarCore
akonadi-singlefileresource
......
......@@ -23,7 +23,7 @@
#include "kolabresource_debug.h"
#include "../imap/uidnextattribute.h"
#include <kolabobject.h>
#include "libkolab/kolabformat/kolabobject.h"
#include <kimap/appendjob.h>
#include <kimap/imapset.h>
......
......@@ -22,7 +22,7 @@
#include "kolabchangeitemsrelationstask.h"
#include "kolabresource_debug.h"
#include <imapflags.h>
#include <kolabobject.h>
#include "libkolab/kolabformat/kolabobject.h"
#include <kimap/appendjob.h>
#include <kimap/imapset.h>
......
......@@ -25,8 +25,8 @@
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
#include <akonadi/notes/noteutils.h>
#include <kolabobject.h>
#include <errorhandler.h>
#include "libkolab/kolabformat/kolabobject.h"
#include "libkolab/kolabformat/errorhandler.h"
#include <KLocalizedString>
#include <QColor>
#include "tracer.h"
......
......@@ -21,8 +21,8 @@
#define KOLABHELPERS_H
#include <AkonadiCore/Item>
#include <kolabdefinitions.h> //libkolab
#include <formathelpers.h> //libkolab
#include "libkolab/kolabformat/kolabdefinitions.h"//libkolab
#include "libkolab/kolabformat/formathelpers.h" //libkolab
#define KOLAB_COLOR_ANNOTATION "/vendor/kolab/color"
......
......@@ -20,7 +20,7 @@
#include "kolabmessagehelper.h"
#include <collectionannotationsattribute.h>
#include <kolabdefinitions.h> //libkolab
#include "libkolab/kolabformat/kolabdefinitions.h"
#include "kolabhelpers.h"
#include "kolabresource_debug.h"
......
......@@ -24,7 +24,7 @@
#include <kimap/selectjob.h>
#include <kimap/fetchjob.h>
#include <imapflags.h>
#include <kolabobject.h>
#include "libkolab/kolabformat/kolabobject.h"
#include "tracer.h"
......
......@@ -112,12 +112,4 @@ endif(BUILD_TESTS)
add_library(pimkolab STATIC ${KOLAB_SRCS})
target_link_libraries(pimkolab ${KOLAB_LINK_LIBRARIES})
set_target_properties(pimkolab PROPERTIES VERSION ${Libkolab_VERSION}
SOVERSION ${Libkolab_VERSION_MAJOR})
install(TARGETS pimkolab EXPORT LibkolabExport
RUNTIME DESTINATION ${BIN_INSTALL_DIR}
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)
......@@ -28,7 +28,7 @@
#include <imapflags.h>
#include <uidnextattribute.h>
#include <kolabobject.h>
#include "libkolab/kolabformat/kolabobject.h"
#include <kimap/appendjob.h>
#include <kimap/searchjob.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment