From: Debian/Kubuntu Qt/KDE Maintainers Date: Sun, 1 Dec 2019 10:14:31 +0000 (+0000) Subject: make_qtwebengine_optional X-Git-Tag: archive/raspbian/4%19.08.3-2+rpi1^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=846ee3cba83593462d78b7c7a19fb6ea5945e74c;p=kdepim-runtime.git make_qtwebengine_optional Gbp-Pq: Name make_qtwebengine_optional.patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d6b9298..4478e125 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,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 cb59e629..bae44e7b 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -43,7 +43,6 @@ add_subdirectory( imap ) if (Libkolabxml_FOUND) add_subdirectory( kolab ) endif() -add_subdirectory( facebook ) add_subdirectory( maildir ) add_subdirectory( openxchange ) @@ -61,5 +60,9 @@ 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( facebook ) + add_subdirectory( tomboynotes ) +endif()