1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Unify "wayland components" qt_find_package() calls

Browse Source 
So that the top-level call in src/CMakeLists.txt finds all the
components, rather than doing it separately in each directory.

This should prevent issues with dependency tracking of found packages
even after the revert of dd7e40b1086020f6a054957f4972720cd6849280 in
qtbase which is found at 8ddd3ee60bff1197b251feadf871fdaeb995ef3b.

Amends a9430f98b399ed39d67ba28544568b898ec55392

Change-Id: I05eef9db2de30a61b1aee532edc331b33fc027fb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
This commit is contained in:
Alexandru Croitor 2020-04-29 13:55:12 +02:00
parent fb8a7a484f
commit 01c959c74e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/wayland/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generated from src.pro.
# special case begin
qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner)
qt_find_package(Wayland)
qt_find_package(Wayland PROVIDED_TARGETS Wayland::Client Wayland::Server)
if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND)
message(WARNING "QtWayland is missing required dependencies, nothing will be built. \