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 --- tests/manual/qmlclient/CMakeLists.txt | 5 ++--- tests/manual/subsurface/CMakeLists.txt | 5 ++--- tests/manual/texture-sharing/cpp-client/CMakeLists.txt | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/qmlclient/CMakeLists.txt b/tests/manual/qmlclient/CMakeLists.txt index 7be97f49d..5443fcbc1 100644 --- a/tests/manual/qmlclient/CMakeLists.txt +++ b/tests/manual/qmlclient/CMakeLists.txt @@ -8,11 +8,10 @@ qt_add_manual_test(qmlclient GUI SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Quick Qt::WaylandClient ) diff --git a/tests/manual/subsurface/CMakeLists.txt b/tests/manual/subsurface/CMakeLists.txt index 10ec44511..fd450f203 100644 --- a/tests/manual/subsurface/CMakeLists.txt +++ b/tests/manual/subsurface/CMakeLists.txt @@ -9,11 +9,10 @@ qt_add_manual_test(subsurface SOURCES main.cpp shmwindow.cpp shmwindow.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Quick Qt::WaylandClient ) diff --git a/tests/manual/texture-sharing/cpp-client/CMakeLists.txt b/tests/manual/texture-sharing/cpp-client/CMakeLists.txt index 4186ce995..03819d3a3 100644 --- a/tests/manual/texture-sharing/cpp-client/CMakeLists.txt +++ b/tests/manual/texture-sharing/cpp-client/CMakeLists.txt @@ -11,12 +11,10 @@ qt_add_manual_test(cpp-client main.cpp INCLUDE_DIRECTORIES ../../../../src/imports/texture-sharing - LIBRARIES - Qt::GuiPrivate - Qt::WaylandClientPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::WaylandClient + Qt::GuiPrivate + Qt::WaylandClientPrivate ) qt6_generate_wayland_protocol_client_sources(cpp-client -- cgit v1.2.3