From a9d76b476f9418c518503145ae54736a1fdc5269 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 6 Jun 2026 10:06:34 +0200 Subject: [PATCH] CMake: Add explicit KDEPIM_EWS option - Make Qt6WebEngine required when enabled - Qca is only used with KDEPIM_EWS Signed-off-by: Andreas Sturmlechner --- CMakeLists.txt | 31 +++++++++++++++++-------------- resources/CMakeLists.txt | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c168592e8..93a365802 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,19 +132,7 @@ set_package_properties( REQUIRED ) -find_package(Qca-qt6 2.3.7 CONFIG REQUIRED) -set_package_properties( - Qca-qt6 - PROPERTIES - DESCRIPTION - "Qt Cryptographic Architecture" - URL - "https://invent.kde.org/libraries/qca" - TYPE - REQUIRED - PURPOSE - "Needed for ews resource." -) +option(KDEPIM_EWS "Enable EWS resource" ON) option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) # QT package find_package(Qt6TextToSpeech ${QT_REQUIRED_VERSION} CONFIG) @@ -171,7 +159,22 @@ find_package( NetworkAuth Concurrent ) -find_package(Qt6WebEngineWidgets ${QT_REQUIRED_VERSION} CONFIG) +if(KDEPIM_EWS) + find_package(Qt6WebEngineWidgets ${QT_REQUIRED_VERSION} CONFIG REQUIRED) + find_package(Qca-qt6 2.3.7 CONFIG REQUIRED) + set_package_properties( + Qca-qt6 + PROPERTIES + DESCRIPTION + "Qt Cryptographic Architecture" + URL + "https://invent.kde.org/libraries/qca" + TYPE + REQUIRED + PURPOSE + "Needed for ews resource." + ) +endif() # KF6 package find_package(KF6Config ${KF_MIN_VERSION} CONFIG REQUIRED) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 73605cd7a..18a88c656 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -67,6 +67,6 @@ add_subdirectory(vcarddir) add_subdirectory(icaldir) add_subdirectory(vcard) add_subdirectory(folderarchivesettings) -if(TARGET Qt::WebEngineWidgets) +if(KDEPIM_EWS) add_subdirectory(ews) endif() -- 2.56.0