diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 17:53:14 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 09:57:26 +0000 |
| commit | 5fad16ac553dd6e80939a64db6ab655e55292aeb (patch) | |
| tree | 2e7cb14e28a930a57ddb9a57ef1b9ef4828e152e /src/qtwaylandscanner | |
| parent | e4cb32970cc1111d7bce95293e6766a879a6b5f7 (diff) | |
| download | qtwayland-5fad16ac553dd6e80939a64db6ab655e55292aeb.tar.gz | |
Fix qtwaylandscanner package dependencieswip/cmake
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>
Diffstat (limited to 'src/qtwaylandscanner')
| -rw-r--r-- | src/qtwaylandscanner/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/qtwaylandscanner/CMakeLists.txt b/src/qtwaylandscanner/CMakeLists.txt index 107702c3..17254afc 100644 --- a/src/qtwaylandscanner/CMakeLists.txt +++ b/src/qtwaylandscanner/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_add_tool(qtwaylandscanner - TOOLS_TARGET QtWaylandScanner # special case + TOOLS_TARGET WaylandScanner # special case SOURCES qtwaylandscanner.cpp PUBLIC_LIBRARIES @@ -14,3 +14,9 @@ qt_add_tool(qtwaylandscanner #### Keys ignored in scope 1:.:.:qtwaylandscanner.pro:<TRUE>: # _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 |