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

Fix qtwaylandscanner package dependencies

Browse Source 
Use the new API provided in qtbase, to register a package dependency
between the client module and the QtWaylandScannerTools package.
Do the same for the compositor module.

Also register a dependency between the QtWaylandScannerTools package
and the WaylandScanner package.

Also fix the tests condition to check the correct _FOUND variable.

Change-Id: Id961a365715cef2d7d0b8a54ca9000dc3890ffd7
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexandru Croitor 2019-11-15 17:53:14 +01:00
parent 6f9b27769f
commit 58b9cfd916
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/CMakeLists.txt
View File

@ -146,3 +146,7 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_draganddrop
SOURCES SOURCES
qwaylanddnd.cpp qwaylanddnd_p.h qwaylanddnd.cpp qwaylanddnd_p.h
) )
# special case begin
qt_record_extra_qt_package_dependency(WaylandClient WaylandScannerTools "")
# special case end

8
src/tools/qtwaylandscanner/CMakeLists.txt
View File

@ -5,7 +5,7 @@
##################################################################### #####################################################################
qt_add_tool(qtwaylandscanner qt_add_tool(qtwaylandscanner
TOOLS_TARGET QtWaylandScanner # special case TOOLS_TARGET WaylandScanner # special case
SOURCES SOURCES
qtwaylandscanner.cpp qtwaylandscanner.cpp
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
@ -14,3 +14,9 @@ qt_add_tool(qtwaylandscanner
#### Keys ignored in scope 1:.:.:qtwaylandscanner.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qtwaylandscanner.pro:<TRUE>:
# _OPTION = "host_build" # _OPTION = "host_build"
# special case begin
# Abuse the function to make sure the package providing qtwaylandscanner calls
# find_package(WaylandScanner), aka the non-qt provided package.
qt_record_extra_package_dependency(qtwaylandscanner WaylandScanner "")
# special case end