D25107: Add install dir for systemd units
This revision was automatically updated to reflect the committed changes. Closed by commit R240:be2beb96a3b8: Fix typo (authored by davidedmundson). CHANGED PRIOR TO COMMIT https://phabricator.kde.org/D25107?vs=70307&id=70340#toc REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D25107?vs=70307&id=70340 REVISION DETAIL https://phabricator.kde.org/D25107 AFFECTED FILES kde-modules/KDEInstallDirs.cmake To: davidedmundson, apol, fvogt Cc: cgiboudeaux, fvogt, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
fvogt accepted this revision. fvogt added inline comments. This revision is now accepted and ready to land. INLINE COMMENTS > KDEInstallDirs.cmake:245 > set(_LIBDIR_DEFAULT "lib") > -# Override this default 'lib' with 'lib64' iff: > +# Override this default 'lib' with 'lib64' if: > # - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling IMO the `iff` here can stay REPOSITORY R240 Extra CMake Modules BRANCH master REVISION DETAIL https://phabricator.kde.org/D25107 To: davidedmundson, apol, fvogt Cc: cgiboudeaux, fvogt, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
davidedmundson updated this revision to Diff 70307. davidedmundson added a comment. Fabian fixes REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D25107?vs=69238&id=70307 BRANCH master REVISION DETAIL https://phabricator.kde.org/D25107 AFFECTED FILES kde-modules/KDEInstallDirs.cmake To: davidedmundson, apol, fvogt Cc: cgiboudeaux, fvogt, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
cgiboudeaux added inline comments. INLINE COMMENTS > KDEInstallDirs.cmake:137-140 > +# [``SYSTEMD_UNIT_INSTALL_DIR``]. Since 5.FIXME > +# ``SYSTEMDUSERUNITDIR`` > +# Systemd uSER Units (``LIBDIR/systemd/user``) > +# [``SYSTEMD_USER_UNIT_INSTALL_DIR``]. Since 5.FIXME These fixme also need to be...fixed :) REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D25107 To: davidedmundson, apol, fvogt Cc: cgiboudeaux, fvogt, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
davidedmundson added a comment. Wow, this part of systemd is shitty :/ static const char* const user_data_unit_paths[] = { "/usr/local/lib/systemd/user", "/usr/local/share/systemd/user", USER_DATA_UNIT_PATH, "/usr/lib/systemd/user", "/usr/share/systemd/user", NULL }; well spotted, will adjust to ${CMAKE_INSTALL_PREFIX}/lib REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D25107 To: davidedmundson, apol, fvogt Cc: fvogt, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
fvogt reopened this revision. fvogt added a comment. This revision is now accepted and ready to land. AFAICT this breaks if `LIBDIR` != "lib". `systemd` only looks in `/usr/lib` AFAICT, so hardcoding to `$prefix/lib/systemd` might be better. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D25107 To: davidedmundson, apol Cc: fvogt, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
fvogt requested changes to this revision. This revision now requires changes to proceed. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D25107 To: davidedmundson, apol, fvogt Cc: fvogt, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
This revision was automatically updated to reflect the committed changes. Closed by commit R240:fb275fb95d9c: Add install dir for systemd units (authored by davidedmundson). REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D25107?vs=69160&id=69238 REVISION DETAIL https://phabricator.kde.org/D25107 AFFECTED FILES kde-modules/KDEInstallDirs.cmake tests/KDEInstallDirsTest/var_list.cmake To: davidedmundson, apol Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
apol accepted this revision. This revision is now accepted and ready to land. REPOSITORY R240 Extra CMake Modules BRANCH master REVISION DETAIL https://phabricator.kde.org/D25107 To: davidedmundson, apol Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns
D25107: Add install dir for systemd units
davidedmundson created this revision. Herald added projects: Frameworks, Build System. Herald added subscribers: kde-buildsystem, kde-frameworks-devel. davidedmundson requested review of this revision. REVISION 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 REPOSITORY R240 Extra CMake Modules BRANCH master REVISION DETAIL https://phabricator.kde.org/D25107 AFFECTED FILES kde-modules/KDEInstallDirs.cmake tests/KDEInstallDirsTest/var_list.cmake To: davidedmundson Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, michaelh, ngraham, bruns