diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 16:28:17 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-26 10:58:56 +0000 |
| commit | 9061f2987213f3b6cc1e6908ba1b0b29daf877f8 (patch) | |
| tree | 3ba9caa7267f47d995b22fd573cb1a23209a7d93 /cmake/QtModuleToolsDependencies.cmake.in | |
| parent | 1c655fb0fc08e89ab5efb23889266b710334f1a5 (diff) | |
Provide a way to specify extra tool package dependencies
In the qtwayland repo, both WaylandClient and WaylandCompositor
packages need access to the qtwaylandscanner tool. That means
that the add_qt_tool(qtwaylandscanner) can't use the TOOLS_TARGET
argument to associate a dependency with only one of the above
modules.
Instead add_qt_tool now allows specifying a non-existent module
name for the TOOLS_TARGET argument, which can be manually
depended on by other packages.
Actually, you could specify the non-existent module before as
well, but that didn't do everything that had to be done.
This required a bit of refactoring in how the Dependencies file
for Tools packages is created. Now the file is created in
qt_export_tools.
Two new functions were also added to allow recording additional
dependencies between packages.
Also some bug fixes were done to make it all work. Specifically
the _FOUND variable generated in the Dependencies file was incorrect.
Also there are some quotes missing when appending extra package
dependencies via the QT_EXTRA_PACKAGE_DEPENDENCIES property.
Change-Id: I167efec16dff8d036e191df3572ea72764e22bc5
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake/QtModuleToolsDependencies.cmake.in')
| -rw-r--r-- | cmake/QtModuleToolsDependencies.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtModuleToolsDependencies.cmake.in b/cmake/QtModuleToolsDependencies.cmake.in index bac8bb0e04..46c60b8484 100644 --- a/cmake/QtModuleToolsDependencies.cmake.in +++ b/cmake/QtModuleToolsDependencies.cmake.in @@ -1,5 +1,5 @@ # Find "ModuleTools" dependencies, which are other ModuleTools packages. -set(_tool_deps "@tool_deps@") +set(_tool_deps "@package_deps@") foreach(_target_dep ${_tool_deps}) list(GET _target_dep 0 pkg) list(GET _target_dep 1 version) @@ -9,7 +9,7 @@ foreach(_target_dep ${_tool_deps}) endif() if (NOT ${pkg}_FOUND) - set(@INSTALL_CMAKE_NAMESPACE@@target@Tools_FOUND FALSE) + set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND FALSE) return() endif() endforeach() |