From 631580b76dd412caa238af43e9d0c37aeb45ea38 Mon Sep 17 00:00:00 2001 From: Hefee Date: Sat, 10 Sep 2022 12:09:36 +0100 Subject: [PATCH] Make GAPI optional Origin: Debian Bug-Debian: https://bugs.debian.org/925155 Last-Update: 2022-08-25 GAPI is only needed for the google resource. If GAPI is not available simply skip building this resource. Gbp-Pq: Name make_GAPI_optional.patch --- CMakeLists.txt | 2 +- resources/CMakeLists.txt | 4 +++- resources/imap/CMakeLists.txt | 24 ++++++++++++++++++------ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffb75c21..c4668cd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,7 +146,7 @@ find_package(KF5Mbox ${KMBOX_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiNotes ${AKONADINOTE_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED) -find_package(KPimGAPI ${KGAPI_LIB_VERSION} CONFIG REQUIRED) +find_package(KPimGAPI ${KGAPI_LIB_VERSION} CONFIG) find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 1e4fbfcf..b132c913 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -60,7 +60,9 @@ add_subdirectory( maildir ) add_subdirectory( openxchange ) add_subdirectory( pop3 ) -add_subdirectory( google-groupware ) +if (KPimGAPI_FOUND) + add_subdirectory( google-groupware ) +endif() add_subdirectory( shared ) add_subdirectory( birthdays ) diff --git a/resources/imap/CMakeLists.txt b/resources/imap/CMakeLists.txt index fcb54fbf..01354c4e 100644 --- a/resources/imap/CMakeLists.txt +++ b/resources/imap/CMakeLists.txt @@ -1,6 +1,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_imap_resource\") -set(WITH_GMAIL_XOAUTH2 TRUE) +if (KPimGAPI_FOUND) + set(WITH_GMAIL_XOAUTH2 TRUE) +else() + set(WITH_GMAIL_XOAUTH2 FALSE) +endif() configure_file(config-imap.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-imap.h) @@ -126,6 +130,17 @@ target_link_libraries(imapresource ) ########### next target ############### +if (KPimGAPI_FOUND) + set(akonadi_imap_resource_KPimGAPI + KPim::GAPICore + ) + set( akonadi_imap_resource_KPimGAPI_SRCS + passwordrequester.cpp + gmailpasswordrequester.cpp + passwordrequester.h + gmailpasswordrequester.h + ) +endif() add_executable(akonadi_imap_resource) ki18n_wrap_ui(akonadi_imap_resource setupserverview_desktop.ui) @@ -136,16 +151,13 @@ target_sources( akonadi_imap_resource PRIVATE settingspasswordrequester.cpp setupserver.cpp serverinfodialog.cpp - passwordrequester.cpp - gmailpasswordrequester.cpp + ${akonadi_imap_resource_KPimGAPI_SRCS} imapresource.h resourcestate.h settingspasswordrequester.h setupserver.h serverinfodialog.h - passwordrequester.h - gmailpasswordrequester.h ) install( FILES imapresource.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents" ) @@ -175,7 +187,7 @@ target_link_libraries(akonadi_imap_resource imapresource KF5::TextWidgets folderarchivesettings - KPim::GAPICore + ${akonadi_imap_resource_KPimGAPI} ) install( -- 2.30.2