From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sun, 1 Dec 2019 10:14:31 +0000 (+0000)
Subject: make_GAPI_optional
X-Git-Tag: archive/raspbian/4%19.08.3-2+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2371824b252834cd309ece1f7fc156a44b92735c;p=kdepim-runtime.git

make_GAPI_optional


Gbp-Pq: Name make_GAPI_optional.patch
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a580b944..7d6b9298 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,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)
 
 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/CMakeLists.txt b/resources/CMakeLists.txt
index 676bb979..cb59e629 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -49,7 +49,9 @@ add_subdirectory( maildir )
 add_subdirectory( openxchange )
 add_subdirectory( pop3 )
 
-add_subdirectory( google )
+if (KPimGAPI_FOUND)
+  add_subdirectory( google )
+endif()
 
 add_subdirectory( shared )
 add_subdirectory( birthdays )
diff --git a/resources/imap/CMakeLists.txt b/resources/imap/CMakeLists.txt
index d412a42f..3f303859 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)
 
@@ -85,6 +89,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
@@ -93,8 +106,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" )
@@ -124,9 +136,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 )