From a986455d108d99ebc8234b9bfab2407c33422e41 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 11 Oct 2019 11:12:43 +0200 Subject: [PATCH] configurejson2cmake: Re-add wayland_server library for qtbase Now there are two of them, one used in qtbase and one in qtwayland. In the future we should merge them. Amends 08aba5ea0ab4196779c79a4e8d8ba6d510b14e12 Change-Id: Ife98df28c762836277a02a34dd07e82ce7a1e871 Reviewed-by: Johan Helsing --- util/cmake/helper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/cmake/helper.py b/util/cmake/helper.py index ed044755b6b..570dc148687 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -418,7 +418,8 @@ _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'), # used in qtbase/src/gui + LibraryMapping("wayland-server", "Wayland", "Wayland::Server"), # used in qtwayland LibraryMapping("wayland-client", "Wayland", "Wayland::Client"), LibraryMapping("wayland-cursor", "Wayland", "Wayland::Cursor"), LibraryMapping("wayland-egl", "Wayland", "Wayland::Egl"),