Make QtWebEngine optional

Origin: Debian
Last-Update: 2019-03-21

Most resources do not depend on QtWebEngine, so let's enable kdepim-runtime for
all other archs, too.
Last-Update: 2019-03-21
Gbp-Pq: Name make_qtwebengine_optional.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c2d46f40c651eb54516787cb5301836a9c0a976..bf28ad672eef2981cc821461b64810a2cfa8938c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,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 3dafa46f61b795768b706ea7aa7a41c74e9facc3..0a27912279101dae89397d9b19757dc01ffc59e6 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -64,5 +64,8 @@ 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( tomboynotes )
+endif()