make_GAPI_optional

Gbp-Pq: Name make_GAPI_optional.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5df2985eb6c908d13f045a4b151ac847c0d241fd..996c61a505c12066b25168078bfc022522307036 100644 (file)
--- 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)
 

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 99f7dbf002830cc6a1b4140f74fb2a062a56d922..86dbb79ed4f56a5a8ef36c6c1715eebfee4c1564 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -51,7 +51,9 @@ add_subdirectory( maildir )
 add_subdirectory( openxchange )
 add_subdirectory( pop3 )
 
-add_subdirectory( google )
+if (KPimGAPI_FOUND)
+   add_subdirectory( google )
+endif()
 # Disabled in KDE 4.14 - too many issues for stable release
 #add_subdirectory( gmail )
 

diff --git a/resources/imap/CMakeLists.txt b/resources/imap/CMakeLists.txt
index d412a42ff3d47e30e4a26109b77bb2cc02db4ae4..3f3038598877de443a90bc3f6e77efcc3484fb27 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)
 
@@ -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 )