We cannot rely on pkgconfig only so use more advanced search for libs
required by screencast portal
Details
- Reviewers
krop - Group Reviewers
Plasma - Commits
- R838:0ff113d3dcbd: Search properly for pipewire and other libs
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.
Findpipewire.cmake and Findspa.cmake are copies of Findgbm.cmake and just modified accordingly, Findglib.cmake is copied from webkit.
CMakeLists.txt | ||
---|---|---|
28–38 | GLib | |
34 | Spa (see below) | |
39–40 | unrelated to this request but the file should be called FindGBM.cmake and the vars changed | |
40 | PipeWire | |
cmake/modules/Findglib.cmake | ||
1 ↗ | (On Diff #31971) | The file should be renamed FindGLib.cmake and the variables be changed |
4–6 ↗ | (On Diff #31971) | GLib_FOUND, GLib_INCLUDE_DIRS, GLIB_LIBRARIES... |
13–16 ↗ | (On Diff #31971) | GIO |
cmake/modules/Findpipewire.cmake | ||
2 ↗ | (On Diff #31971) | FindPipeWire and rename the file and variables |
62–67 ↗ | (On Diff #31971) | Not needed, the file is not installed and the module already requires 2.8.12 |
69 ↗ | (On Diff #31971) | Remove |
78 ↗ | (On Diff #31971) | PipeWire_INCLUDE_DIRS |
85 ↗ | (On Diff #31971) | PipeWire_LIBRARIES |
114–117 ↗ | (On Diff #31971) | Remove, this is a new module, you don't need compat vars |
cmake/modules/Findspa.cmake | ||
2 ↗ | (On Diff #31971) | FindSPA (and rename the vars and the file) |
9 ↗ | (On Diff #31971) | SPA_FOUND |
13 ↗ | (On Diff #31971) | SPA_LIBRARIES (and same thing for the other vars) |
62–67 ↗ | (On Diff #31971) | Not needed, the module already requires 2.8.12 and this file is not installed. |
69 ↗ | (On Diff #31971) | Not needed. Remove this line (& the matching endif()) |
114–117 ↗ | (On Diff #31971) | This module is new, you don't need compat variables. |
src/CMakeLists.txt | ||
6 | Not needed for gbm, SPA and PipeWire, you created targets | |
51–52 | PipeWire::PipeWire | |
52 | Spa::Spa | |
52–56 | why ? | |
53 | GLIB_LIBRARIES was fine (well, GLib_LIBRARIES once the file is fixed) |