diff options
| author | Johan Klokkhammer Helsing <[email protected]> | 2019-09-17 14:26:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2019-09-17 17:12:11 +0000 |
| commit | 08aba5ea0ab4196779c79a4e8d8ba6d510b14e12 (patch) | |
| tree | 86d0dd87a1eefc56f4e86181f7ab72d57983e9b2 | |
| parent | 89e347ba4232f1d7b1d7c9def6c7249850b01602 (diff) | |
cmake: Add library mappings for qtwayland
Change-Id: I9d394229073579df104e21c539bbbb614ef8efbd
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Qt CMake Build Bot
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 1 | ||||
| -rw-r--r-- | util/cmake/helper.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 5676aa536b3..31e062580b5 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -499,6 +499,7 @@ def parseTest(ctx, test, data, cm_fh): 'separate_debug_info', # FIXME: see if cmake can do this 'gc_binaries', 'libinput_axis_api', + 'wayland-scanner', 'xlib', } diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 42b1396dfe4..de946a58dbc 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -168,6 +168,7 @@ _qt_library_map = [ LibraryMapping('uitools', 'Qt6', 'Qt::UiTools', extra = ['COMPONENTS', 'UiTools']), LibraryMapping('virtualkeyboard', 'Qt6', 'Qt::VirtualKeyboard', extra = ['COMPONENTS', 'VirtualKeyboard']), LibraryMapping('vulkan_support', 'Qt6', 'Qt::VulkanSupport', extra = ['COMPONENTS', 'VulkanSupport']), + LibraryMapping('waylandclient', 'Qt6', 'Qt::WaylandClient', extra = ['COMPONENTS', 'WaylandClient']), LibraryMapping('webchannel', 'Qt6', 'Qt::WebChannel', extra = ['COMPONENTS', 'WebChannel']), LibraryMapping('webengine', 'Qt6', 'Qt::WebEngine', extra = ['COMPONENTS', 'WebEngine']), LibraryMapping('webenginewidgets', 'Qt6', 'Qt::WebEngineWidgets', extra = ['COMPONENTS', 'WebEngineWidgets']), @@ -239,7 +240,10 @@ _library_map = [ LibraryMapping('udev', 'Libudev', 'PkgConfig::Libudev'), LibraryMapping('udev', 'Libudev', 'PkgConfig::Libudev'), # see also libudev! LibraryMapping('vulkan', 'Vulkan', 'Vulkan::Vulkan'), - LibraryMapping('wayland_server', 'Wayland', 'Wayland::Server'), + LibraryMapping('wayland-server', 'Wayland', 'Wayland::Server'), + LibraryMapping('wayland-client', 'Wayland', 'Wayland::Client'), + LibraryMapping('wayland-cursor', 'Wayland', 'Wayland::Cursor'), + LibraryMapping('wayland-egl', 'Wayland', 'Wayland::Egl'), LibraryMapping('x11sm', 'X11', '${X11_SM_LIB} ${X11_ICE_LIB}', resultVariable="X11_SM"), LibraryMapping('xcb', 'XCB', 'XCB::XCB', extra = ['1.9'], resultVariable='TARGET XCB::XCB', appendFoundSuffix=False), LibraryMapping('xcb_glx', 'XCB', 'XCB::GLX', extra = ['COMPONENTS', 'GLX'], resultVariable='XCB_GLX'), |