Skip to content

Commit

Permalink
Use PkgConfig to find development headers (#3661)
Browse files Browse the repository at this point in the history
openSUSE puts it's xkbcommon and libinput development headers in a
non-standard location, which isn't Mir's problem, but it also doesn't
implement PkgConfig properly to find those headers.

This is what I did to get it to package for openSUSE, but this should
benefit any distribution that uses PkgConfig to find development files.
  • Loading branch information
AlanGriffiths authored Nov 6, 2024
2 parents 758d5e3 + 5dea692 commit c755749
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/common/events/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ add_library(
target_link_libraries(mirevents
PUBLIC
mircore
PkgConfig::XKBCOMMON
)
2 changes: 2 additions & 0 deletions src/platforms/evdev/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ target_link_libraries(mirevdevutilsobjects
PUBLIC
mircommon
mircore
PkgConfig::LIBINPUT
)

add_library(mirplatforminputevdevobjects OBJECT
Expand All @@ -27,6 +28,7 @@ target_link_libraries(mirplatforminputevdevobjects
mirplatform
mircommon
mircore
PkgConfig::LIBINPUT
)

add_library(mirplatforminputevdev MODULE
Expand Down
1 change: 1 addition & 0 deletions tests/unit-tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ target_link_libraries(
mircommon

Boost::system
PkgConfig::LIBINPUT
PkgConfig::WAYLAND_SERVER
${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
)
Expand Down

0 comments on commit c755749

Please sign in to comment.