From 12a17e8bdafc6d85a44a72787c7ca35d31cf137a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 7 Aug 2023 14:16:09 +0200 Subject: CMake: Add dependencies from qhelpgenerator to needed plugins Add build dependencies between helpgenerator and the two plugins it needs. This allows one to run a top level documentation build with just configure cmake --build . docs Change-Id: I50d96cdcb3873beb9399c3441b3becf2fb79c6ec Reviewed-by: Alexandru Croitor (cherry picked from commit 85e769fc36c1c9da995f5761bf9cca4b37e7eaa1) Reviewed-by: Qt Cherry-pick Bot --- src/assistant/qhelpgenerator/CMakeLists.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/assistant/qhelpgenerator/CMakeLists.txt b/src/assistant/qhelpgenerator/CMakeLists.txt index e53106e08..7230d248e 100644 --- a/src/assistant/qhelpgenerator/CMakeLists.txt +++ b/src/assistant/qhelpgenerator/CMakeLists.txt @@ -24,12 +24,13 @@ qt_internal_add_tool(${target_name} ) qt_internal_return_unless_building_tools() +set(needed_plugins + QMinimalIntegrationPlugin + QSQLiteDriverPlugin +) +list(TRANSFORM needed_plugins PREPEND Qt:: OUTPUT_VARIABLE needed_plugin_targets) + if(NOT QT_BUILD_SHARED_LIBS) - set(needed_plugins - QMinimalIntegrationPlugin - QSQLiteDriverPlugin - ) - list(TRANSFORM needed_plugins PREPEND Qt:: OUTPUT_VARIABLE needed_plugin_targets) if(QT_SUPERBUILD) # In a top-level build, qt_import_plugins() is a no-op because # __qt_internal_add_static_plugins_once() is not called. @@ -60,4 +61,8 @@ ${import_plugin_code} INCLUDE ${needed_plugin_targets} ) endif() +else() # QT_BUILD_SHARED_LIBS + if(QT_SUPERBUILD) + add_dependencies(qhelpgenerator ${needed_plugins}) + endif() endif() -- cgit v1.2.3