diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b43ef9..6485bdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,151 +1,154 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) project(liquidshell) find_package(ECM 1.3.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMInstallIcons) find_package(Qt5 5.6 CONFIG REQUIRED COMPONENTS Core Widgets DBus X11Extras ) find_package(KF5 REQUIRED COMPONENTS WindowSystem WidgetsAddons ConfigWidgets Config KIO IconThemes ItemViews Archive Notifications I18n NetworkManagerQt Service Solid BluezQt KCMUtils Crash DBusAddons NewStuff ) set(SOURCES desktop.cxx DesktopWidget.cxx DesktopPanel.cxx OnScreenVolume.cxx ConfigureDesktopDialog.cxx StartMenu.cxx Launcher.cxx QuickLaunch.cxx IconButton.cxx AppMenu.cxx Pager.cxx PagerButton.cxx WindowList.cxx ClockWidget.cxx ClockWidgetConfigureDialog.cxx TaskBar.cxx TaskBarButton.cxx LockLogout.cxx SysTray.cxx SysTrayItem.cxx SysTrayNotifyItem.cxx DBusTypes.cxx SysLoad.cxx NotificationServer.cxx NotificationList.cxx Network.cxx NetworkList.cxx DeviceNotifier.cxx DeviceList.cxx Battery.cxx Bluetooth.cxx PopupMenu.cxx KdeConnect.cxx DesktopApplet.cxx WeatherApplet.cxx WeatherAppletConfigureDialog.cxx DiskUsageApplet.cxx DiskUsageAppletConfigureDialog.cxx PictureFrameApplet.cxx PictureFrameAppletConfigureDialog.cxx ) find_package(packagekitqt5 QUIET) if ( packagekitqt5_FOUND ) set(SOURCES ${SOURCES} PkUpdates.cxx PkUpdateList.cxx ) add_definitions(-DWITH_PACKAGEKIT) else() message(WARNING "PackageKit integration not available. packagekitqt5 development files not found") endif() # e.g. on openSuse Leap 42.3 compile fails as a GLib header included uses signals as var add_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) ki18n_wrap_ui(UI_FILES ConfigureDesktopDialog.ui WeatherAppletConfigureDialog.ui DiskUsageAppletConfigureDialog.ui PictureFrameAppletConfigureDialog.ui ) set(statusnotifieritem_xml ${KNOTIFICATIONS_DBUS_INTERFACES_DIR}/kf5_org.kde.StatusNotifierItem.xml) set_source_files_properties(${statusnotifieritem_xml} PROPERTIES INCLUDE "DBusTypes.hxx" CLASSNAME OrgKdeStatusNotifierItem ) qt5_add_dbus_interface(SOURCES ${statusnotifieritem_xml} statusnotifieritem_interface) qt5_add_dbus_adaptor(SOURCES org.freedesktop.Notifications.xml NotificationServer.hxx NotificationServer) set(TARGET liquidshell) add_executable(${TARGET} ${SOURCES} ${UI_FILES}) set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD 11) target_link_libraries(${TARGET} Qt5::Core Qt5::Widgets Qt5::DBus Qt5::X11Extras KF5::WindowSystem KF5::WidgetsAddons KF5::ConfigWidgets KF5::ConfigCore KF5::KIOCore KF5::KIOWidgets KF5::IconThemes KF5::Notifications KF5::I18n KF5::NetworkManagerQt KF5::Service KF5::Solid KF5::BluezQt KF5::KCMUtils KF5::Crash KF5::DBusAddons KF5::ItemViews KF5::Archive KF5::NewStuff ) if ( packagekitqt5_FOUND ) target_link_libraries(${TARGET} PK::packagekitqt5) endif() install(TARGETS ${TARGET} ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES org.kde.${TARGET}.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) configure_file(start_liquidshell start_liquidshell @ONLY) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/start_liquidshell DESTINATION ${KDE_INSTALL_BINDIR}) +configure_file(liquidshell-session.desktop liquidshell-session.desktop @ONLY) +install(FILES liquidshell-session.desktop DESTINATION ${KDE_INSTALL_DATADIR}/xsessions) + install(FILES liquidshell.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) ecm_install_icons(ICONS 48-apps-liquidshell.png DESTINATION ${ICON_INSTALL_DIR} THEME hicolor) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES) diff --git a/liquidshell-session.desktop b/liquidshell-session.desktop index 0c91da5..d55ed14 100644 --- a/liquidshell-session.desktop +++ b/liquidshell-session.desktop @@ -1,29 +1,29 @@ [Desktop Entry] Type=XSession -Exec=/usr/bin/start_liquidshell -TryExec=/usr/bin/start_liquidshell +Exec=@CMAKE_INSTALL_FULL_BINDIR@/start_liquidshell +TryExec=@CMAKE_INSTALL_FULL_BINDIR@/start_liquidshell DesktopNames=KDE Name=Liquidshell Name[ca]=Liquidshell Name[ca@valencia]=Liquidshell Name[cs]=Liquidshell Name[de]=Liquidshell Name[el]=Liquidshell Name[en_GB]=Liquidshell Name[es]=Liquidshell Name[et]=Liquidshell Name[fi]=Liquidshell Name[fr]=Liquidshell Name[gl]=Liquidshell Name[it]=Liquidshell Name[ko]=Liquidshell Name[lt]=Liquidshell Name[nl]=Liquidshell Name[pl]=Liquidshell Name[pt]=Liquidshell Name[pt_BR]=Liquidshell Name[sv]=Liquid skal Name[tg]=Восити рақиқи Name[uk]=Liquidshell Name[x-test]=xxLiquidshellxx Name[zh_TW]=Liquidshell