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 675884f49a506b3249effc72f7af0863513ab0e3..5159a5fd5ecc5b7f7f773205721fa7962c6964f0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,8 @@ set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION "Qt Cryptographic Architec
                    PURPOSE "Needed for ews resource.")
 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)
 
 
 # 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()