Commit 642aa185 authored by Shashwat Jolly's avatar Shashwat Jolly

Move EteSync package requirement from local CMakeLists file to top-level

parent f906ebfd
......@@ -133,6 +133,10 @@ find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
find_package(KPimGAPI ${KGAPI_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
# EteSync package
find_package(PkgConfig REQUIRED)
pkg_check_modules(ETESYNC REQUIRED etesync)
option(KDEPIM_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE)
option(NO_REGENERATE_MIME "Don't regenerate mime file (developer-only option)" FALSE )
......
......@@ -30,9 +30,6 @@ qt5_add_dbus_adaptor(etesyncresource_SRCS
add_executable(akonadi_etesync_resource ${etesyncresource_SRCS})
set_target_properties(akonadi_etesync_resource PROPERTIES MACOSX_BUNDLE FALSE)
find_package(PkgConfig REQUIRED)
pkg_check_modules(ETESYNC REQUIRED etesync)
target_link_libraries(akonadi_etesync_resource
${ETESYNC_LIBRARIES}
Qt5::DBus
......
......@@ -108,7 +108,7 @@ void etesyncResource::retrieveItems(const Akonadi::Collection &collection)
EteSyncSyncEntry *syncEntry = etesync_entry_get_sync_entry(entry, cryptoManager, prevUid);
QString action = QStringFromCharArr(etesync_sync_entry_get_action(syncEntry));
const QString action = QStringFromCharArr(etesync_sync_entry_get_action(syncEntry));
KContacts::VCardConverter converter;
const char *contentStr = etesync_sync_entry_get_content(syncEntry);
QByteArray content(contentStr);
......
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