diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-24 16:23:53 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 09:57:22 +0000 |
commit | e4cb32970cc1111d7bce95293e6766a879a6b5f7 (patch) | |
tree | c637be5f9e9a654c949dc2ce00d60c3c97ba8f99 /src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt | |
parent | b77269ff500e184237d523496e17639c94009ac8 (diff) |
CMake: Regenerate and adjust projects after merge
Some of the changes that were needed
- adjusted wayland macros due to changed target names for plugins
- a few direct moc file includes, to get rid of compilation errors
- Threads::Threads linking for a few tests
- a few special cases for QT_FOR_PRIVATE handling because pro2cmake
doesn't handle those correctly at the moment (they map to
PRIVATE_MODULE_INTERFACE rather than PRIVATE_LIBRARIES)
- just regenerating all projects
Change-Id: I418ce91b1c69c7388d41eb22b94a93a9e80fa732
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt')
-rw-r--r-- | src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt index ecb8066de..b625c22b7 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcomposite-glx.pro. ##################################################################### -## qt-wayland-compositor-xcomposite-glx Plugin: +## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qt-wayland-compositor-xcomposite-glx +qt_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin + OUTPUT_NAME qt-wayland-compositor-xcomposite-glx TYPE wayland-graphics-integration-server - CLASS_NAME QWaylandXCompositeGlxClientBufferIntegrationPlugin 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 @@ -17,19 +17,19 @@ qt_add_plugin(qt-wayland-compositor-xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES - Qt::CorePrivate Qt::GlxSupportPrivate # special case - Qt::GuiPrivate - Qt::WaylandCompositorPrivate Wayland::Server PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::WaylandCompositor + Qt::WaylandCompositorPrivate ) -qt6_generate_wayland_protocol_server_sources(qt-wayland-compositor-xcomposite-glx +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 |