Merge remote-tracking branch 'origin/wip/cmake' into dev

Adjusted xcomposite-glx to link against X11.

Added latest Coin instructions, plus some additional logic
to skip some platforms where building wayland does not make sense.
Otherwise Coin will fail on those platforms when trying to extract
artifacts that don't exist.

Conflicts:
  coin/module_config.yaml
  src/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri
  src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt

Change-Id: I2383b0826ece841f3862f396516f402390aa42be

15 files changed, 468 insertions, 0 deletions

diff --git a/src/plugins/hardwareintegration/compositor/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/CMakeLists.txt
new file mode 100644
index 000000000..67ca5a4b3
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from compositor.pro.
+
+add_subdirectory(hardwarelayer)
+if(QT_FEATURE_wayland_dmabuf_client_buffer)
+    add_subdirectory(linux-dmabuf-unstable-v1)
+endif()
+if(QT_FEATURE_wayland_egl)
+    add_subdirectory(wayland-egl)
+    add_subdirectory(wayland-eglstream-controller)
+endif()
+if(QT_FEATURE_wayland_brcm)
+    add_subdirectory(brcm-egl)
+endif()
+if(QT_FEATURE_xcomposite_egl)
+    add_subdirectory(xcomposite-egl)
+endif()
+if(QT_FEATURE_xcomposite_glx)
+    add_subdirectory(xcomposite-glx)
+endif()
+if(QT_FEATURE_wayland_drm_egl_server_buffer)
+    add_subdirectory(drm-egl-server)
+endif()
+if(QT_FEATURE_wayland_libhybris_egl_server_buffer)
+    add_subdirectory(libhybris-egl-server)
+endif()
+if(QT_FEATURE_wayland_shm_emulation_server_buffer)
+    add_subdirectory(shm-emulation-server)
+endif()
+if(QT_FEATURE_wayland_dmabuf_server_buffer)
+    add_subdirectory(dmabuf-server)
+endif()
+if(QT_FEATURE_wayland_vulkan_server_buffer)
+    add_subdirectory(vulkan-server)
+endif()
diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt
new file mode 100644
index 000000000..fb3dc1adf
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from brcm-egl.pro.
+
+#####################################################################
+## QWaylandBrcmClientBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWaylandBrcmClientBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-brcm-egl
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.h
+        ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/brcm-egl
+    LIBRARIES
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(QWaylandBrcmClientBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/brcm-egl/../../../extensions/brcm.xml
+)
+
+#### Keys ignored in scope 1:.:.:brcm-egl.pro:<TRUE>:
+# OTHER_FILES = "brcm-egl.json"
diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt
new file mode 100644
index 000000000..80cfd59b0
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Generated from dmabuf-server.pro.
+
+#####################################################################
+## DmaBufServerBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(DmaBufServerBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-dmabuf-server-buffer
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/dmabuf-server
+    LIBRARIES
+        EGL::EGL
+        Libdrm::Libdrm
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(DmaBufServerBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/dmabuf-server/../../../extensions/qt-dmabuf-server-buffer.xml
+)
+
+#### Keys ignored in scope 1:.:.:dmabuf-server.pro:<TRUE>:
+# OTHER_FILES = "dmabuf-server.json"
diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt
new file mode 100644
index 000000000..95c726fe2
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from drm-egl-server.pro.
+
+#####################################################################
+## DrmEglServerBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(DrmEglServerBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-drm-egl-server-buffer
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/drm-egl-server
+    LIBRARIES
+        EGL::EGL
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(DrmEglServerBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/drm-egl-server/../../../extensions/drm-egl-server-buffer.xml
+)
+
+#### Keys ignored in scope 1:.:.:drm-egl-server.pro:<TRUE>:
+# OTHER_FILES = "drm-egl-server.json"
diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/hardwarelayer/CMakeLists.txt
new file mode 100644
index 000000000..5a40a66b3
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Generated from hardwarelayer.pro.
+
+if(QT_FEATURE_wayland_layer_integration_vsp2)
+    add_subdirectory(vsp2)
+endif()
diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt
new file mode 100644
index 000000000..f1040f7d4
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Generated from vsp2.pro.
+
+#####################################################################
+## Vsp2HardwareLayerIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(Vsp2HardwareLayerIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-vsp2
+    TYPE wayland-hardware-layer-integration
+    SOURCES
+        ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2
+    LIBRARIES
+        PkgConfig::Waylandkms
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+#### Keys ignored in scope 1:.:.:vsp2.pro:<TRUE>:
+# OTHER_FILES = "vsp2.json"
diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt
new file mode 100644
index 000000000..f0e6bec6c
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from libhybris-egl-server.pro.
+
+#####################################################################
+## LibHybrisEglServerBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(LibHybrisEglServerBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-libybris-egl-server.json
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/libhybris-egl-server
+    LIBRARIES
+        EGL::EGL
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(LibHybrisEglServerBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/libhybris-egl-server/../../../extensions/libhybris-egl-server-buffer.xml
+)
+
+#### Keys ignored in scope 1:.:.:libhybris-egl-server.pro:<TRUE>:
+# OTHER_FILES = "libhybris-egl-server.json"
diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
new file mode 100644
index 000000000..35ffd7dcc
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from linux-dmabuf-unstable-v1.pro.
+
+#####################################################################
+## QWaylandDmabufClientBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-linux-dmabuf-unstable-v1
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+        ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1
+    LIBRARIES
+        EGL::EGL
+        Libdrm::Libdrm
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::EglSupportPrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(QWaylandDmabufClientBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/../../../3rdparty/protocol/linux-dmabuf-unstable-v1.xml
+)
+
+#### Keys ignored in scope 1:.:.:linux-dmabuf-unstable-v1.pro:<TRUE>:
+# OTHER_FILES = "linux-dmabuf.json"
diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt
new file mode 100644
index 000000000..707a53809
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from shm-emulation-server.pro.
+
+#####################################################################
+## ShmServerBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(ShmServerBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-shm-emulation-server
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/shm-emulation-server
+    LIBRARIES
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(ShmServerBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/shm-emulation-server/../../../extensions/shm-emulation-server-buffer.xml
+)
+
+#### Keys ignored in scope 1:.:.:shm-emulation-server.pro:<TRUE>:
+# OTHER_FILES = "shm-emulation-server.json"
diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt
new file mode 100644
index 000000000..472728a64
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from vulkan-server.pro.
+
+#####################################################################
+## VulkanServerBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(VulkanServerBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-vulkan-server
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h
+        ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/vulkan-server
+        ../../../../hardwareintegration/compositor/vulkan-server/../../../3rdparty/util
+    LIBRARIES
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::VulkanSupportPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(VulkanServerBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/vulkan-server/../../../extensions/qt-vulkan-server-buffer-unstable-v1.xml
+)
+
+#### Keys ignored in scope 1:.:.:vulkan-server.pro:<TRUE>:
+# OTHER_FILES = "vulkan-server.json"
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
new file mode 100644
index 000000000..ea307288d
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Generated from wayland-egl.pro.
+
+#####################################################################
+## QWaylandEglClientBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWaylandEglClientBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-wayland-egl
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/wayland-egl
+    LIBRARIES
+        EGL::EGL
+        Wayland::Egl
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::EglSupportPrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+#### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>:
+# OTHER_FILES = "wayland-egl.json"
diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
new file mode 100644
index 000000000..10932f15a
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
@@ -0,0 +1,34 @@
+# Generated from wayland-eglstream-controller.pro.
+
+#####################################################################
+## QWaylandEglStreamBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWaylandEglStreamBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h
+        ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/wayland-eglstream-controller
+    LIBRARIES
+        EGL::EGL
+        Wayland::Egl
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::EglSupportPrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml
+)
+
+#### Keys ignored in scope 1:.:.:wayland-eglstream-controller.pro:<TRUE>:
+# OTHER_FILES = "wayland-eglstream-controller.json"
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt
new file mode 100644
index 000000000..c8beed397
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from xcomposite-egl.pro.
+
+#####################################################################
+## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-xcomposite-egl
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/xcomposite-egl
+        ../../../../hardwareintegration/compositor/xcomposite_share
+    LIBRARIES
+        EGL::EGL
+        Wayland::Server
+        X11::X11
+    PUBLIC_LIBRARIES
+        PkgConfig::XComposite
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeEglClientBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml
+)
+
+#### Keys ignored in scope 1:.:.:xcomposite-egl.pro:<TRUE>:
+# OTHER_FILES = "xcomposite-egl.json"
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt
new file mode 100644
index 000000000..0c448debb
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt
@@ -0,0 +1,39 @@
+# Generated from xcomposite-glx.pro.
+
+#####################################################################
+## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-xcomposite-glx
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/xcomposite-glx
+        ../../../../hardwareintegration/compositor/xcomposite_share
+    LIBRARIES
+        Wayland::Server
+        X11::X11
+    PUBLIC_LIBRARIES
+        PkgConfig::XComposite
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml
+)
+
+#### Keys ignored in scope 1:.:.:xcomposite-glx.pro:<TRUE>:
+# OTHER_FILES = "xcomposite-glx.json"
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt
new file mode 100644
index 000000000..0a2ef9831
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from xcomposite-glx.pro.
+
+#####################################################################
+## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-xcomposite-glx
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/xcomposite-glx
+        ../../../../hardwareintegration/compositor/xcomposite_share
+    LIBRARIES
+        Qt::GlxSupportPrivate # special case
+        Wayland::Server
+        X11::X11
+    PUBLIC_LIBRARIES
+        PkgConfig::XComposite
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml
+)
+
+#### Keys ignored in scope 1:.:.:xcomposite-glx.pro:<TRUE>:
+# OTHER_FILES = "xcomposite-glx.json"