Properly search for PipeWire libs
ClosedPublic

Authored by jgrulich on Feb 10 2020, 10:21 AM.

Details

Summary

Recent change in upcoming PipeWire releases made all headers to be
installed versioned directories so multiple versions can be installed
at once. We have to search a bit differently now. This change makes
it to search first for PipeWire 0.3 and if it's not found, we try to
search for the previous version.

Diff Detail

Repository
R838 Flatpak Support: KDE Portal for XDG Desktop
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
jgrulich created this revision.Feb 10 2020, 10:21 AM
Restricted Application added a project: Plasma. · View Herald TranscriptFeb 10 2020, 10:21 AM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
jgrulich requested review of this revision.Feb 10 2020, 10:21 AM
jgrulich updated this revision to Diff 75371.Feb 10 2020, 2:50 PM

Simplify cmake code

jgrulich updated this revision to Diff 75372.Feb 10 2020, 2:53 PM
  • Fix cmake variable name
jgrulich updated this revision to Diff 75373.Feb 10 2020, 2:56 PM

Drop unrelated change

cgiboudeaux added inline comments.
cmake/modules/FindPipeWire.cmake
73

this would break includes

73

That's still the current way to include it

75–84

Use:

${PKG_PipeWire_INCLUDE_DIRS}
${PKG_PipeWire_INCLUDE_DIRS}/pipewire-0.3

instead.

cgiboudeaux added inline comments.Feb 10 2020, 3:14 PM
cmake/modules/FindPipeWire.cmake
74

same thing for this one

76
${PKG_Spa_INCLUDE_DIRS}
${PKG_Spa_INCLUDE_DIRS}/spa-0.2
jgrulich updated this revision to Diff 75379.Feb 10 2020, 3:22 PM
jgrulich marked 5 inline comments as done.

Improve includes

Fixed all issues.

cgiboudeaux accepted this revision.Feb 10 2020, 3:35 PM

Just one thing left to fix before pushing

cmake/modules/FindPipeWire.cmake
112

INTERFACE_INCLUDE_DIRECTORIES "${PipeWire_INCLUDE_DIRS};${Spa_INCLUDE_DIRS}"

This revision is now accepted and ready to land.Feb 10 2020, 3:35 PM
This revision was automatically updated to reflect the committed changes.