From e4cb32970cc1111d7bce95293e6766a879a6b5f7 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 24 Mar 2020 16:23:53 +0100 Subject: 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 Reviewed-by: Alexandru Croitor --- src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/plugins/platforms/qwayland-brcm-egl') diff --git a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt index ed42a728d..554f24ba7 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt +++ b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from qwayland-brcm-egl.pro. ##################################################################### -## qwayland-brcm-egl Plugin: +## QWaylandBrcmEglPlatformIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwayland-brcm-egl +qt_add_plugin(QWaylandBrcmEglPlatformIntegrationPlugin + OUTPUT_NAME qwayland-brcm-egl TYPE platforms - CLASS_NAME QWaylandBrcmEglPlatformIntegrationPlugin SOURCES ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h @@ -14,20 +14,17 @@ qt_add_plugin(qwayland-brcm-egl main.cpp INCLUDE_DIRECTORIES ../../../hardwareintegration/client/brcm-egl - LIBRARIES - Qt::EglSupportPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} EGL::EGL Qt::Core - Qt::EglSupport + Qt::EglSupportPrivate Qt::Gui - Qt::WaylandClient + Qt::WaylandClientPrivate Wayland::Client ) -qt6_generate_wayland_protocol_client_sources(qwayland-brcm-egl +qt6_generate_wayland_protocol_client_sources(QWaylandBrcmEglPlatformIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/brcm-egl/../../../extensions/brcm.xml ) -- cgit v1.2.3