Make GAPI optional

Origin: Debian
Bug-Debian: https://bugs.debian.org/925155
Last-Update: 2019-03-20

GAPI is only needed for the google resource. If GAPI is not available simply skip
building this resource.
Last-Update: 2019-03-20
Gbp-Pq: Name make_GAPI_optional.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb0210c3dc78f6b95974a922e3866342ba3706c4..c14b28db8ca944358521c5fa39f44a65d484cbe0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,7 +135,7 @@ 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(KF5PimCommon ${PIMCOMMON_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_LIB} CONFIG REQUIRED)
 find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
 

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 7aab42c1d5f421b49c1ad7fb50ba99c584964d0b..62fbdef3c81cb42c6a7638a91b68a0381e4a9acd 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -52,7 +52,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 c648dd9233acb7da55669730b3d0fab5b90f1d3c..28766b6ffb64ba48d6d7a914ff1f48cde02dedb9 100644 (file)
--- 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)
 
@@ -91,6 +95,15 @@ 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
+   )
+endif()
 
 set( akonadi_imap_resource_SRCS
   main.cpp
@@ -99,8 +112,7 @@ set( akonadi_imap_resource_SRCS
   settingspasswordrequester.cpp
   setupserver.cpp
   serverinfodialog.cpp
-  passwordrequester.cpp
-  gmailpasswordrequester.cpp
+  ${akonadi_imap_resource_KPimGAPI_SRCS}
 )
 
 install( FILES imapresource.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents" )
@@ -130,9 +142,12 @@ target_link_libraries(akonadi_imap_resource
     imapresource
     KF5::TextWidgets
     folderarchivesettings
-    KPim::GAPICore
+    ${akonadi_imap_resource_KPimGAPI}
 )
 
+
+
+
 install(TARGETS akonadi_imap_resource ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_subdirectory( wizard )