diff options
| author | David Edmundson <kde@davidedmundson.co.uk> | 2019-11-03 22:04:30 +0000 |
|---|---|---|
| committer | David Edmundson <kde@davidedmundson.co.uk> | 2019-11-03 22:04:30 +0000 |
| commit | fb275fb95d9c41c091fd0ebb9ac4f8edb78eb89b (patch) | |
| tree | 015f2e0f895bea3e43eaa3de192a5a20c457f8f4 | |
| parent | 879769daf04714bf4f34098e3b1fcce0f6c1b6e8 (diff) | |
| download | extra-cmake-modules-fb275fb95d9c41c091fd0ebb9ac4f8edb78eb89b.tar.gz extra-cmake-modules-fb275fb95d9c41c091fd0ebb9ac4f8edb78eb89b.tar.bz2 | |
Add install dir for systemd units
Summary: Like we have for other FD.O projects like DBus service files
Test Plan:
Unit test passes
Used in another project, and it installed to the correct place
Reviewers: apol
Reviewed By: apol
Subscribers: kde-frameworks-devel, kde-buildsystem
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D25107
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 14 | ||||
| -rw-r--r-- | tests/KDEInstallDirsTest/var_list.cmake | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 0acd33f0..154823eb 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -132,6 +132,12 @@ # Qt logging categories files directory (``DATAROOTDIR/qlogging-categories5``) Since 5.59.0 # ``JARDIR`` # Java AAR/JAR files for Android. Since 5.62.0 +# ``SYSTEMDUNITDIR`` +# Systemd Units (``LIBDIR/systemd``) +# [``SYSTEMD_UNIT_INSTALL_DIR``]. Since 5.FIXME +# ``SYSTEMDUSERUNITDIR`` +# Systemd uSER Units (``LIBDIR/systemd/user``) +# [``SYSTEMD_USER_UNIT_INSTALL_DIR``]. Since 5.FIXME # # If ``KDE_INSTALL_USE_QT_SYS_PATHS`` is set to TRUE before including this # module, the default values for some variables are instead queried from @@ -640,8 +646,12 @@ _define_relative(DBUSSERVICEDIR DBUSDIR "services" _define_relative(DBUSSYSTEMSERVICEDIR DBUSDIR "system-services" "D-Bus system services" DBUS_SYSTEM_SERVICES_INSTALL_DIR) - - +_define_relative(SYSTEMDUNITDIR LIBDIR "systemd" + "Systemd units" + SYSTEMD_UNIT_INSTALL_DIR) +_define_relative(SYSTEMDUSERUNITDIR SYSTEMDUNITDIR "user" + "Systemd user units" + SYSTEMD_USER_UNIT_INSTALL_DIR) set(_default_sysconf_dir "etc") diff --git a/tests/KDEInstallDirsTest/var_list.cmake b/tests/KDEInstallDirsTest/var_list.cmake index f6dc95d1..a706cef8 100644 --- a/tests/KDEInstallDirsTest/var_list.cmake +++ b/tests/KDEInstallDirsTest/var_list.cmake @@ -42,6 +42,8 @@ set(var_suffixes SHAREDSTATEDIR SOUNDDIR SYSCONFDIR + SYSTEMDUNITDIR + SYSTEMDUSERUNITDIR TEMPLATEDIR WALLPAPERDIR) if(APPLE) @@ -84,6 +86,8 @@ set(compat_QTQUICKIMPORTSDIR IMPORTS_INSTALL_DIR) set(compat_SBINDIR SBIN_INSTALL_DIR) set(compat_SOUNDDIR SOUND_INSTALL_DIR) set(compat_SYSCONFDIR SYSCONF_INSTALL_DIR) +set(compat_SYSTEM_UNIT_INSTALL_DIR) +set(compat_SYSTEM_USER_UNIT_INSTALL_DIR) set(compat_TEMPLATEDIR TEMPLATES_INSTALL_DIR) set(compat_WALLPAPERDIR WALLPAPER_INSTALL_DIR) if(APPLE) |