diff --git a/CMakeLists.txt b/CMakeLists.txt
index b14e9194e5f7195fc4905bc46ea6d730a0fa828b..e0d155b06924b089a24e08554187150fa8c074f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 )
 
diff --git a/resources/etesync/CMakeLists.txt b/resources/etesync/CMakeLists.txt
index c7a4e52bc0afe6c03359dd8d7a87735b1e0c3901..e88d48f218e2e818e032af3dfd389ed0ed57373b 100644
--- a/resources/etesync/CMakeLists.txt
+++ b/resources/etesync/CMakeLists.txt
@@ -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
diff --git a/resources/etesync/etesyncresource.cpp b/resources/etesync/etesyncresource.cpp
index 501a0baccc1ff3ff5e4072a4fc4e1903e131699c..14818a674d796979e6fc594531b43004500cea55 100644
--- a/resources/etesync/etesyncresource.cpp
+++ b/resources/etesync/etesyncresource.cpp
@@ -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);