diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-27 08:51:53 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-29 13:51:58 +0200 |
| commit | 6319bc72e2dc63175ca797ee3042955f852e008f (patch) | |
| tree | c9c1c71c43394a4cd2f0f6a75df8ba6f3a2550f3 /config.tests/wayland_scanner | |
| parent | 00c8a79da0c80616f18329cdfc61338a2c1af7df (diff) | |
| parent | 28e7d940c42c47cf039522709883ae3de9f4fb88 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/client/xdgoutput/tst_xdgoutput.cpp
Regenerated CMake projects.
Removed duplicate wayland source in
tests/auto/client/xdgoutput/xdgoutput.pro. It's still
referenced via the included shared.pri file. Regenerated
the CMake project to adapt to that. Otherwise the CMake
project fails to configure due to duplicate rules with
a error like the one below
CMake Error at src/compositor/Qt6WaylandCompositorMacros.cmake:13 (add_custom_command):
Attempt to add a custom rule to output
tests/auto/client/xdgoutput/wayland-xdg-output-unstable-v1-server-protocol.h.rule
Also use a workaround fix for configuring CMake standalone tests
due to regression introduced by
dd7e40b1086020f6a054957f4972720cd684 in qtbase.
Change-Id: Ib364b851a1fa828c153efbf8653c9e4ef5e618cd
Diffstat (limited to 'config.tests/wayland_scanner')
| -rw-r--r-- | config.tests/wayland_scanner/CMakeLists.txt | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/config.tests/wayland_scanner/CMakeLists.txt b/config.tests/wayland_scanner/CMakeLists.txt index 794f48b16..b0286da49 100644 --- a/config.tests/wayland_scanner/CMakeLists.txt +++ b/config.tests/wayland_scanner/CMakeLists.txt @@ -1,7 +1,22 @@ # Generated from wayland_scanner.pro. cmake_minimum_required(VERSION 3.14.0) -project(config_test_wayland_scanner LANGUAGES CXX) +project(config_test_wayland_scanner LANGUAGES C CXX) + +foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES}) + find_package(${p}) +endforeach() + +if(QT_CONFIG_COMPILE_TEST_LIBRARIES) + link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES}) +endif() +if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS) + foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS}) + if(TARGET ${lib}) + link_libraries(${lib}) + endif() + endforeach() +endif() add_executable(${PROJECT_NAME} main.cpp |