diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-18 15:04:52 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2019-09-25 11:38:22 +0000 |
| commit | eaf0b2709192aaf1671b5ed126082bc194dc7822 (patch) | |
| tree | 5003dbc69714e606cf0eaf46673c6b97ac8975d6 | |
| parent | 2fd3b44697fd94a799fb31550f4a3c6cf547b028 (diff) | |
CMake: Add missing library-mappings for QtWayland
I haven't checked if the config for wayland-kms actually works, as that
requires building for a target that supports it (RCar M3 or similar).
Task-number: QTBUG-78177
Change-Id: Ib30a63a4e5feb955d17763c37e32ad3f2c13d358
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | util/cmake/helper.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 011c277c11..1188a93d4d 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -310,6 +310,9 @@ _qt_library_map = [ LibraryMapping( "waylandclient", "Qt6", "Qt::WaylandClient", extra=["COMPONENTS", "WaylandClient"] ), + LibraryMapping( + "waylandcompositor", "Qt6", "Qt::WaylandCompositor", extra=["COMPONENTS", "WaylandCompositor"] + ), LibraryMapping("webchannel", "Qt6", "Qt::WebChannel", extra=["COMPONENTS", "WebChannel"]), LibraryMapping("webengine", "Qt6", "Qt::WebEngine", extra=["COMPONENTS", "WebEngine"]), LibraryMapping( @@ -411,6 +414,8 @@ _library_map = [ LibraryMapping("wayland-client", "Wayland", "Wayland::Client"), LibraryMapping("wayland-cursor", "Wayland", "Wayland::Cursor"), LibraryMapping("wayland-egl", "Wayland", "Wayland::Egl"), + LibraryMapping('wayland-kms', 'Waylandkms', 'PkgConfig::Waylandkms'), #TODO: check if this actually works + LibraryMapping("x11", "X11", "X11::X11"), LibraryMapping("x11sm", "X11", "${X11_SM_LIB} ${X11_ICE_LIB}", resultVariable="X11_SM"), LibraryMapping( "xcb", @@ -487,6 +492,7 @@ _library_map = [ "xcb_xkb", "XCB", "XCB::XKB", extra=["COMPONENTS", "XKB"], resultVariable="XCB_XKB" ), LibraryMapping("xcb_xlib", "X11_XCB", "X11::XCB"), + LibraryMapping('xcomposite', 'XComposite', 'PkgConfig::XComposite'), LibraryMapping("xkbcommon_evdev", "XKB", "XKB::XKB", extra=["0.4.1"]), # see also xkbcommon LibraryMapping("xkbcommon_x11", "XKB", "XKB::XKB", extra=["0.4.1"]), # see also xkbcommon LibraryMapping("xkbcommon", "XKB", "XKB::XKB", extra=["0.4.1"]), |