From f1b0d016ab7c1eeadd0f7487a5253d0681a23bae Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sat, 20 Jul 2019 13:02:06 +0200 Subject: [PATCH] Always build Kirigami app Summary: It is functional on the desktop as well and provides a place for controls for desktop to desktop features (e.g. MprisRemote, LockPlugin) and controls for non-Plasma desktops (e.g. Remotekeyboard, not yet implemented) Test Plan: Builds Reviewers: #kde_connect, apol, sredman Reviewed By: apol Subscribers: piggz, apol, sredman, kdeconnect Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D15399 --- CMakeLists.txt | 9 ++------- plugins/CMakeLists.txt | 13 +++++-------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9aed535c7..467aed828 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ if (SAILFISHOS) else() set(KF5_MIN_VERSION "5.48.0") set(QT_MIN_VERSION "5.10.0") - set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service) + set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service Kirigami2) set(KF5_OPTIONAL_COMPONENTS DocTools) if(UNIX) set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner) @@ -88,12 +88,6 @@ endif() add_subdirectory(icon) add_subdirectory(interfaces) add_subdirectory(data) - -option(EXPERIMENTALAPP_ENABLED OFF) -if(EXPERIMENTALAPP_ENABLED) - find_package(KF5Kirigami2) - add_subdirectory(app) -endif() add_subdirectory(plugins) add_subdirectory(cli) add_subdirectory(declarativeplugin) @@ -103,6 +97,7 @@ if(KF5Runner_FOUND) endif() if (NOT SAILFISHOS) + add_subdirectory(app) add_subdirectory(indicator) add_subdirectory(urlhandler) add_subdirectory(nautilus-extension) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index cb9560a12..84858cac0 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -8,6 +8,11 @@ add_subdirectory(sendnotifications) add_subdirectory(mpriscontrol) add_subdirectory(photo) add_subdirectory(systemvolume) +add_subdirectory(remotecommands) +add_subdirectory(mprisremote) +add_subdirectory(remotecontrol) +add_subdirectory(lockdevice) +add_subdirectory(remotesystemvolume) if(NOT SAILFISHOS) add_subdirectory(clipboard) @@ -33,14 +38,6 @@ if(NOT SAILFISHOS) endif() endif() -if(SAILFISHOS OR EXPERIMENTALAPP_ENABLED) - add_subdirectory(remotecommands) - add_subdirectory(mprisremote) - add_subdirectory(remotecontrol) - add_subdirectory(lockdevice) - add_subdirectory(remotesystemvolume) -endif() - option(EXPERIMENTAL_PRESENTER "Enables building the experimental on-screen pointer for presentations" OFF) if(EXPERIMENTAL_PRESENTER) add_subdirectory(presenter)