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 c14b28db8ca944358521c5fa39f44a65d484cbe0..1498810ecc9dd00983069ecc417a5050a21c7217 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,8 @@ set_package_properties(Sasl2 PROPERTIES TYPE REQUIRED)
 find_package(Qca-qt5 2.3.0 CONFIG REQUIRED)
 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 62fbdef3c81cb42c6a7638a91b68a0381e4a9acd..381730d9aa2b871558d5881df12f36792e875cf1 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()