tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always build Kirigami app

Browse source 
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
This commit is contained in:
Nicolas Fella 2019-07-20 13:02:06 +02:00
parent 0b6224fc0e
commit f1b0d016ab
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -37,7 +37,7 @@ if (SAILFISHOS)
else() else()
set(KF5_MIN_VERSION "5.48.0") set(KF5_MIN_VERSION "5.48.0")
set(QT_MIN_VERSION "5.10.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) set(KF5_OPTIONAL_COMPONENTS DocTools)
if(UNIX) if(UNIX)
set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner) set(KF5_OPTIONAL_COMPONENTS ${KF5_OPTIONAL_COMPONENTS} Runner)
@ -88,12 +88,6 @@ endif()
add_subdirectory(icon) add_subdirectory(icon)
add_subdirectory(interfaces) add_subdirectory(interfaces)
add_subdirectory(data) add_subdirectory(data)
option(EXPERIMENTALAPP_ENABLED OFF)
if(EXPERIMENTALAPP_ENABLED)
find_package(KF5Kirigami2)
add_subdirectory(app)
endif()
add_subdirectory(plugins) add_subdirectory(plugins)
add_subdirectory(cli) add_subdirectory(cli)
add_subdirectory(declarativeplugin) add_subdirectory(declarativeplugin)
@ -103,6 +97,7 @@ if(KF5Runner_FOUND)
endif() endif()
if (NOT SAILFISHOS) if (NOT SAILFISHOS)
add_subdirectory(app)
add_subdirectory(indicator) add_subdirectory(indicator)
add_subdirectory(urlhandler) add_subdirectory(urlhandler)
add_subdirectory(nautilus-extension) add_subdirectory(nautilus-extension)

13
plugins/CMakeLists.txt
View file

@ -8,6 +8,11 @@ add_subdirectory(sendnotifications)
add_subdirectory(mpriscontrol) add_subdirectory(mpriscontrol)
add_subdirectory(photo) add_subdirectory(photo)
add_subdirectory(systemvolume) add_subdirectory(systemvolume)
add_subdirectory(remotecommands)
add_subdirectory(mprisremote)
add_subdirectory(remotecontrol)
add_subdirectory(lockdevice)
add_subdirectory(remotesystemvolume)
if(NOT SAILFISHOS) if(NOT SAILFISHOS)
add_subdirectory(clipboard) add_subdirectory(clipboard)
@ -33,14 +38,6 @@ if(NOT SAILFISHOS)
endif() endif()
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) option(EXPERIMENTAL_PRESENTER "Enables building the experimental on-screen pointer for presentations" OFF)
if(EXPERIMENTAL_PRESENTER) if(EXPERIMENTAL_PRESENTER)
add_subdirectory(presenter) add_subdirectory(presenter)