summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-10-12 17:21:13 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-10-12 22:00:36 (GMT)
commit11199bb2bcd1dcc8b64218e9a323ecca89634f50 (patch)
treece6991f038f7d9f39f559413b08ea7e40f741700
parent98394329783f0a2b4733eedcee1eb93f734e48b0 (diff)
Adjust buildsystem for gpgme-1.7
-rw-r--r--CMakeLists.txt6
-rw-r--r--kaddressbook/editorpages/CMakeLists.txt4
-rw-r--r--kaddressbook/importexportplugins/CMakeLists.txt6
-rw-r--r--kaddressbook/importexportplugins/vcards/CMakeLists.txt10
-rw-r--r--plugins/messageviewerheaderplugins/autotests/CMakeLists.txt4
-rw-r--r--plugins/messageviewerplugins/autotests/CMakeLists.txt6
6 files changed, 14 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3591765..38bac04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,6 @@ set(MESSAGELIB_LIB_VERSION "5.3.64")
set(AKONADICALENDAR_LIB_VERSION "5.3.40")
set(CALENDAR_UTILS_VERSION "5.3.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.3.42")
-set(GPGMEPP_LIB_VERSION "5.3.40")
find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED)
find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
@@ -94,7 +93,6 @@ find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED)
@@ -105,6 +103,10 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
# Extra package
find_package(KF5GAPI "5.1.40" CONFIG)
+find_package(Gpgmepp 1.7.1 CONFIG)
+set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME library" URL "http://www.gnupg.org" TYPE REQUIRED)
+
+
if (KDEPIMADDONS_BUILD_EXAMPLES)
add_subdirectory(examples)
endif()
diff --git a/kaddressbook/editorpages/CMakeLists.txt b/kaddressbook/editorpages/CMakeLists.txt
index 4d1b015..e125b43 100644
--- a/kaddressbook/editorpages/CMakeLists.txt
+++ b/kaddressbook/editorpages/CMakeLists.txt
@@ -4,9 +4,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"cryptopageplugin\")
########### next target ###############
set(cryptopageplugin_SRCS cryptopageplugin.cpp )
-include_directories(${GPGME_INCLUDES} )
-
add_library(cryptopageplugin MODULE ${cryptopageplugin_SRCS})
-target_link_libraries(cryptopageplugin KF5::Contacts KF5::AkonadiContact KF5::Libkleo KF5::IconThemes KF5::I18n KF5::Completion)
+target_link_libraries(cryptopageplugin KF5::Contacts KF5::AkonadiContact KF5::Libkleo KF5::IconThemes KF5::I18n KF5::Completion Gpgmepp)
install(TARGETS cryptopageplugin DESTINATION ${KDE_INSTALL_LIBDIR}/akonadi/contact/editorpageplugins/)
diff --git a/kaddressbook/importexportplugins/CMakeLists.txt b/kaddressbook/importexportplugins/CMakeLists.txt
index 9cbd7d5..66ec010 100644
--- a/kaddressbook/importexportplugins/CMakeLists.txt
+++ b/kaddressbook/importexportplugins/CMakeLists.txt
@@ -2,15 +2,13 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kaddressbook_importexportplugins\")
include_directories(${CMAKE_CURRENT_BINARY_DIR}/shared)
-if(KF5Gpgmepp_FOUND)
- add_definitions(-DQGPGME_FOUND)
-endif()
+add_definitions(-DQGPGME_FOUND)
add_subdirectory(shared)
add_subdirectory(vcards)
add_subdirectory(csv)
add_subdirectory(gmx)
-add_subdirectory(ldap)
+add_subdirectory(ldap)
add_subdirectory(ldif)
diff --git a/kaddressbook/importexportplugins/vcards/CMakeLists.txt b/kaddressbook/importexportplugins/vcards/CMakeLists.txt
index e204d96..a990f63 100644
--- a/kaddressbook/importexportplugins/vcards/CMakeLists.txt
+++ b/kaddressbook/importexportplugins/vcards/CMakeLists.txt
@@ -18,13 +18,7 @@ target_link_libraries(kaddressbook_importexportvcardplugin
KF5::KaddressbookGrantlee
KF5::JobWidgets
kaddressbookimportexportlibprivate
+ Gpgmepp
+ QGpgme
)
-if (WIN32)
- target_link_libraries(kaddressbook_importexportvcardplugin KF5::Gpgmepp)
-else()
- target_link_libraries(kaddressbook_importexportvcardplugin KF5::Gpgmepp-pthread)
-endif()
-if(KF5Gpgmepp_FOUND)
- target_link_libraries(kaddressbook_importexportvcardplugin KF5::QGpgme)
-endif()
diff --git a/plugins/messageviewerheaderplugins/autotests/CMakeLists.txt b/plugins/messageviewerheaderplugins/autotests/CMakeLists.txt
index 257a420..7b124da 100644
--- a/plugins/messageviewerheaderplugins/autotests/CMakeLists.txt
+++ b/plugins/messageviewerheaderplugins/autotests/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(add_messageviewer_header_unittest _source _additional)
add_test( ${_name} ${_name} )
ecm_mark_as_test(messageviewer-header-${_name})
- target_link_libraries( ${_name} KF5::MessageViewer KF5::Libkleo KF5::QGpgme Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme)
+ target_link_libraries( ${_name} KF5::MessageViewer KF5::Libkleo Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme)
endmacro ()
@@ -18,7 +18,7 @@ macro(add_messageviewer_header_class_unittest _source )
add_test( ${_name} ${_name} )
ecm_mark_as_test(messageviewer-header-${_name})
- target_link_libraries( ${_name} KF5::MessageViewer KF5::Libkleo KF5::QGpgme Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme)
+ target_link_libraries( ${_name} KF5::MessageViewer KF5::Libkleo Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme)
endmacro ()
diff --git a/plugins/messageviewerplugins/autotests/CMakeLists.txt b/plugins/messageviewerplugins/autotests/CMakeLists.txt
index 8925caa..e8b29a3 100644
--- a/plugins/messageviewerplugins/autotests/CMakeLists.txt
+++ b/plugins/messageviewerplugins/autotests/CMakeLists.txt
@@ -12,7 +12,7 @@ macro(add_messageviewer_viewerplugin_unittest _source _additional _jsonfile)
ecm_add_test(${_test}
TEST_NAME ${_name}
NAME_PREFIX "messageviewerplugins-"
- LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo KF5::QGpgme Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme KF5::IncidenceEditor
+ LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme KF5::IncidenceEditor
)
endmacro ()
@@ -25,7 +25,7 @@ macro(add_messageviewer_viewerplugin_class_unittest _source )
ecm_add_test(${_test}
TEST_NAME ${_name}
NAME_PREFIX "messageviewerplugins-"
- LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo KF5::QGpgme Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme
+ LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme
)
endmacro ()
@@ -36,7 +36,7 @@ macro(add_messageviewer_viewerplugin_widget_unittest _source _additional )
ecm_add_test(${_test}
TEST_NAME ${_name}
NAME_PREFIX "messageviewerplugins-"
- LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo KF5::QGpgme Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme KF5::IncidenceEditor)
+ LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme KF5::IncidenceEditor)
endmacro ()