From 5165a8d7e6018693081c91703e45a7bd463883c0 Mon Sep 17 00:00:00 2001 From: hefee Date: Tue, 26 May 2020 23:00:37 +0100 Subject: [PATCH] Make QtWebEngine optional Origin: Debian Last-Update: 2019-03-21 Most resources do not depdend 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 --- CMakeLists.txt | 3 ++- resources/CMakeLists.txt | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c2d46f4..bf28ad67 100644 --- 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 3dafa46f..0a279122 100644 --- 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() -- 2.30.2