diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-15 15:39:26 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-16 15:07:45 +0200 |
| commit | b0d9992c3a0590e970f0bf06f3cc5b8c53314002 (patch) | |
| tree | 15119c1570337a9aa55d5c9b938d7d3c76d00df5 | |
| parent | c8ec83b2851526530937ff1189575ad7b339d903 (diff) | |
CMake: Explicitly search for XKB
...like we do for X11 in 488ce1ce371921c891423f54557f66aacd00fb0f.
Change-Id: Ib058b6d9fc3a8d6b27327794aba9b2f3dd828bcc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/client/configure.cmake | 4 | ||||
| -rw-r--r-- | src/compositor/configure.cmake | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/client/configure.cmake b/src/client/configure.cmake index 6e6b0f33d..62da9940b 100644 --- a/src/client/configure.cmake +++ b/src/client/configure.cmake @@ -24,6 +24,10 @@ qt_find_package(XComposite PROVIDED_TARGETS PkgConfig::XComposite MODULE_NAME wa if(NOT TARGET X11::X11) qt_find_package(X11 PROVIDED_TARGETS X11::X11 MODULE_NAME gui QMAKE_LIB xlib) endif() +# Same for XKB. +if(NOT TARGET XKB::XKB) + qt_find_package(XKB 0.5.0 PROVIDED_TARGETS XKB::XKB MODULE_NAME gui QMAKE_LIB xkbcommon) +endif() # special case end #### Tests diff --git a/src/compositor/configure.cmake b/src/compositor/configure.cmake index 731213178..3c40f340f 100644 --- a/src/compositor/configure.cmake +++ b/src/compositor/configure.cmake @@ -23,6 +23,10 @@ qt_find_package(XComposite PROVIDED_TARGETS PkgConfig::XComposite MODULE_NAME wa if(NOT TARGET X11::X11) qt_find_package(X11 PROVIDED_TARGETS X11::X11 MODULE_NAME gui QMAKE_LIB xlib) endif() +# Same for XKB. +if(NOT TARGET XKB::XKB) + qt_find_package(XKB 0.5.0 PROVIDED_TARGETS XKB::XKB MODULE_NAME gui QMAKE_LIB xkbcommon) +endif() #### Tests |