From f13070c5e4a735ad00af236d5506c4153b01c773 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Sun, 8 Nov 2020 23:21:52 +0000 Subject: [PATCH] Make QtWebEngine an optional requirement Forwarded: no Last-Update: 2020-08-14 This makes it possible to build kaccount-provides, albeith without the nextcloud plugin, also on architectures that do not have QtWebEngine. Gbp-Pq: Name optional-qtwebengine.diff --- CMakeLists.txt | 3 ++- plugins/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ff3cf8..7542071 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_P find_package(Intltool REQUIRED) find_package(KAccounts REQUIRED) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml WebEngineWidgets) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml) +find_package(Qt5WebEngineWidgets ${QT_REQUIRED_VERSION} CONFIG) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED KIO I18n Declarative Package) include(KDEInstallDirs) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 3ea1817..b9a12a5 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,2 +1,4 @@ add_subdirectory(owncloud-ui) -add_subdirectory(nextcloud-ui) \ No newline at end of file +if (Qt5WebEngineWidgets_FOUND) + add_subdirectory(nextcloud-ui) +endif() -- 2.30.2