make_qtwebengine_optional

Gbp-Pq: Name make_qtwebengine_optional.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d6b9298456b1db72d870744699429b7cc28ffc4..4478e125457026bc7874deb48e66af785cf345c0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,8 @@ set_package_properties(Sasl2 PROPERTIES TYPE REQUIRED)
 find_package(Qca-qt5)
 option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
 # QT5 package
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus WebEngineWidgets NetworkAuth)
+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED TextToSpeech Network Widgets Test XmlPatterns DBus NetworkAuth)
+find_package(Qt5 OPTIONAL_COMPONENTS WebEngineWidgets)
 if (NOT Qca-qt5_FOUND)
     message(STATUS "QCA not found, public key authentication will not be supported")
 else()

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index cb59e629aa45a54f9efd8560df3bc4f4c9c99760..bae44e7b9ca6ca4a4d6c86ccf38291b7f85393e2 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -43,7 +43,6 @@ add_subdirectory( imap )
 if (Libkolabxml_FOUND)
     add_subdirectory( kolab )
 endif()
-add_subdirectory( facebook )
 add_subdirectory( maildir )
 
 add_subdirectory( openxchange )
@@ -61,5 +60,9 @@ add_subdirectory( vcarddir )
 add_subdirectory( icaldir )
 add_subdirectory( vcard )
 add_subdirectory( folderarchivesettings )
-add_subdirectory( tomboynotes )
-add_subdirectory( ews )
+
+if(Qt5WebEngineWidgets_FOUND)
+  add_subdirectory( ews )
+  add_subdirectory( facebook )
+  add_subdirectory( tomboynotes )
+endif()