summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-11 11:12:43 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-11 09:17:09 +0000
commita986455d108d99ebc8234b9bfab2407c33422e41 (patch)
tree96a1361aafe450020daf749d4b620302792a7cc2 /util
parentffb28b99303a7ba68d249c5da0e74587058dcde5 (diff)
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 <johan.helsing@qt.io>
Diffstat (limited to 'util')
-rw-r--r--util/cmake/helper.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index ed044755b6..570dc14868 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"),