Differential D9482

Use cmake function 'kdbusaddons_generate_dbus_service_file' from kdbusaddons to generate dbus service file
ClosedPublic
Actions

Authored by habacker on Dec 22 2017, 8:54 PM.

Details

Reviewers
dfaure
kfunk
Commits
R297:21d5201ea81e: Use cmake function 'kdbusaddons_generate_dbus_service_file' from kdbusaddons to…
Test Plan

compiled against kdbusaddons development package with related support

Diff Detail

Repository
R297 KDED
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
habacker created this revision.Dec 22 2017, 8:54 PM
Restricted Application added a project: Frameworks. · View Herald TranscriptDec 22 2017, 8:54 PM
Restricted Application added a subscriber: Frameworks. · View Herald Transcript
habacker requested review of this revision.Dec 22 2017, 8:54 PM
habacker updated this revision to Diff 24312.Dec 22 2017, 9:05 PM
  • remove obsolate service template
dfaure added inline comments.Dec 23 2017, 1:02 PM
src/CMakeLists.txt
34

Shouldn't that be ${KDE_INSTALL_FULL_BINDIR} instead?

habacker added a comment.Dec 23 2017, 8:44 PM

I can update the patch with this path if you want. It came from the service template file

Exec=@CMAKE_INSTALL_PREFIX@/bin/kded5
dfaure added a comment.Dec 23 2017, 8:55 PM

Indeed that was a bug in the .in files, arguably.
The executables get installed into KDE_INSTALL_BINDIR (says kde-modules/KDEInstallDirs.cmake), so if we want the full path version of it, it should be KDE_INSTALL_FULL_BINDIR.

habacker updated this revision to Diff 24345.Dec 23 2017, 10:25 PM
  • use KDE_INSTALL_FULL_BINDIR instead of CMAKE_INSTALL_PREFIX
dfaure requested changes to this revision.Jan 2 2018, 8:32 AM
dfaure added inline comments.
src/CMakeLists.txt
34

Remove the /bin, it's part of KDE_INSTALL_FULL_BINDIR...

This revision now requires changes to proceed.Jan 2 2018, 8:32 AM
habacker updated this revision to Diff 24563.Jan 2 2018, 9:24 AM
  • remove trailing/bin
habacker marked 2 inline comments as done.Jan 2 2018, 9:57 AM
habacker added a comment.Jan 4 2018, 8:50 PM

Rechecked after applying D9480 (with a minor cmake 3.5 fix, see f316004e8a17) without any issue, please accept.

habacker updated this revision to Diff 24739.Jan 4 2018, 9:13 PM
  • removed obsolate service template file
dfaure accepted this revision.Jan 5 2018, 8:36 AM
This revision is now accepted and ready to land.Jan 5 2018, 8:36 AM
Closed by commit R297:21d5201ea81e: Use cmake function 'kdbusaddons_generate_dbus_service_file' from kdbusaddons to… (authored by habacker). · Explain WhyJan 5 2018, 8:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msrc/CMakeLists.txt (5 lines)
DMsrc/org.kde.kded5.service.in (3 lines)

Diff 24345

View Options

src/CMakeLists.txt

Loading...
View Options

src/org.kde.kded5.service.in

Loading...