diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2021-06-16 03:44:22 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2021-06-16 15:45:09 +0200 |
| commit | 0c93bfd8679319cc906544141287c0e973b8555d (patch) | |
| tree | e407c719ec598337782502d94ee5a5e3bab5f989 /src/plugins | |
| parent | 50b105194211531fed9c553f7010ab70f9225540 (diff) | |
| download | qtwayland-0c93bfd8679319cc906544141287c0e973b8555d.tar.gz | |
cmake: be more flexible when creating Wayland client and server extension headers
This was hardcoded to QtWaylandClient/QtWaylandServer for cmake, while $$MODULE_INCNAME
was used in the old qmake world.
(this is an update to the previous commit, fixing the client side of things, plus adding
an override for both)
The header location will now default to the current Qt modules private include
dir (as it was in qmake times), but we now also have the ability to override
this default via WAYLAND_INCLUDE_DIR to deal with special cases like the
WlShellExtension (which is an own Qt private module itself)
Pick-to: 6.2
Change-Id: I4e96578a9a00598c236fcd22a460aeca4984baeb
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/shellintegration/wl-shell/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/shellintegration/wl-shell/CMakeLists.txt index 0a0a83d1..d7c052fa 100644 --- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/plugins/shellintegration/wl-shell/CMakeLists.txt @@ -17,6 +17,8 @@ qt_internal_add_module(WlShellIntegrationPrivate ) qt6_generate_wayland_protocol_client_sources(WlShellIntegrationPrivate + # this is just a helper module and still part of the QtWaylandClient build + WAYLAND_INCLUDE_DIR QtWaylandClient/private FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland.xml ) |