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 8c7c623f2e5c3ffdd2630e3694995dbfca445ed5..bda17b14369131f23e0674604dd86a64af5c917b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,8 @@ set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
 if(Qt5TextToSpeech_FOUND)
 set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
 endif()
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus WebEngineWidgets NetworkAuth)
+find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus NetworkAuth)
+find_package(Qt5 OPTIONAL_COMPONENTS WebEngineWidgets)
 
 
 # KF5 package

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 0cf2ff1d269f0d15dc2c5222a67b08a8a74da699..ea4309f65882f43ad1b84dc349a56fa382ed5ca0 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -75,5 +75,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()