Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
KDE PIM Runtime
Commits
642aa185
Commit
642aa185
authored
Jun 10, 2020
by
Shashwat Jolly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move EteSync package requirement from local CMakeLists file to top-level
parent
f906ebfd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
CMakeLists.txt
CMakeLists.txt
+4
-0
resources/etesync/CMakeLists.txt
resources/etesync/CMakeLists.txt
+0
-3
resources/etesync/etesyncresource.cpp
resources/etesync/etesyncresource.cpp
+1
-1
No files found.
CMakeLists.txt
View file @
642aa185
...
...
@@ -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
)
...
...
resources/etesync/CMakeLists.txt
View file @
642aa185
...
...
@@ -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
...
...
resources/etesync/etesyncresource.cpp
View file @
642aa185
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment