diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2024-02-29 16:33:19 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-19 14:25:23 +0000 |
| commit | 190ee23d9046f20a61ae4089c53456f98f2804b3 (patch) | |
| tree | 7b5296d6869dd57fc47ac08cb4f24b79121f8a2f | |
| parent | 69adb3c330768a56a585f3cfa123bfde0d8fe768 (diff) | |
virtualassistant: Explicitly link dependencies
Without this, the build system can decide to build the different targets
in an order that prevents the types from being available to qmlcachegen.
This in turn leads to irreproducible builds.
Fixes: QTBUG-122722
Change-Id: I3e94f035ed5dd43dfb4911186499f3a1a8d8a351
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7dab97e1da482aebcb2907da342a3c23b2d79ccf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
5 files changed, 44 insertions, 1 deletions
diff --git a/examples/quick3d/virtualassistant/CMakeLists.txt b/examples/quick3d/virtualassistant/CMakeLists.txt index 2f6ddc34..557ca58d 100644 --- a/examples/quick3d/virtualassistant/CMakeLists.txt +++ b/examples/quick3d/virtualassistant/CMakeLists.txt @@ -14,7 +14,12 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick3d/virtualassistant") -find_package(Qt6 6.5 REQUIRED COMPONENTS Core Gui Qml Quick) +find_package(Qt6 6.5 + REQUIRED COMPONENTS + Core Gui Qml Quick Quick3D Quick3DHelpers + OPTIONAL_COMPONENTS + QuickControls2 QuickLayouts QuickTimeline +) qt_standard_project_setup(REQUIRES 6.5) diff --git a/examples/quick3d/virtualassistant/asset_imports/Quick3DAssets/RobotHeart/CMakeLists.txt b/examples/quick3d/virtualassistant/asset_imports/Quick3DAssets/RobotHeart/CMakeLists.txt index ac59f027..6e724ac5 100644 --- a/examples/quick3d/virtualassistant/asset_imports/Quick3DAssets/RobotHeart/CMakeLists.txt +++ b/examples/quick3d/virtualassistant/asset_imports/Quick3DAssets/RobotHeart/CMakeLists.txt @@ -11,3 +11,9 @@ qt_add_qml_module(RobotHeart RESOURCES meshes/plane.mesh ) + +target_link_libraries(RobotHeart PRIVATE Qt${QT_VERSION_MAJOR}::Quick3D) + +if(TARGET Qt${QT_VERSION_MAJOR}::QuickTimeline) + target_link_libraries(RobotHeart PRIVATE Qt${QT_VERSION_MAJOR}::QuickTimeline) +endif() diff --git a/examples/quick3d/virtualassistant/asset_imports/Quick3DAssets/VirtualAssistant/CMakeLists.txt b/examples/quick3d/virtualassistant/asset_imports/Quick3DAssets/VirtualAssistant/CMakeLists.txt index 93d521f7..f4fb0990 100644 --- a/examples/quick3d/virtualassistant/asset_imports/Quick3DAssets/VirtualAssistant/CMakeLists.txt +++ b/examples/quick3d/virtualassistant/asset_imports/Quick3DAssets/VirtualAssistant/CMakeLists.txt @@ -14,3 +14,14 @@ qt_add_qml_module(VirtualAssistant meshes/mesh_108.mesh meshes/mesh_109.mesh ) + +target_link_libraries(VirtualAssistant + PRIVATE + Qt${QT_VERSION_MAJOR}::Quick3D + Qt${QT_VERSION_MAJOR}::Quick + RobotHeartplugin +) + +if(TARGET Qt${QT_VERSION_MAJOR}::QuickTimeline) + target_link_libraries(VirtualAssistant PRIVATE Qt${QT_VERSION_MAJOR}::QuickTimeline) +endif() diff --git a/examples/quick3d/virtualassistant/content/CMakeLists.txt b/examples/quick3d/virtualassistant/content/CMakeLists.txt index d7d8d701..f7d11ab6 100644 --- a/examples/quick3d/virtualassistant/content/CMakeLists.txt +++ b/examples/quick3d/virtualassistant/content/CMakeLists.txt @@ -14,3 +14,20 @@ qt_add_qml_module(robotassistant RESOURCES colosseum_4k.hdr ) + +target_link_libraries(robotassistant + PRIVATE + Qt${QT_VERSION_MAJOR}::Quick + Qt${QT_VERSION_MAJOR}::Quick3D + Qt${QT_VERSION_MAJOR}::Quick3DHelpers + Constantsplugin + VirtualAssistantplugin +) + +if(TARGET Qt${QT_VERSION_MAJOR}::QuickControls2) + target_link_libraries(robotassistant PRIVATE Qt${QT_VERSION_MAJOR}::QuickControls2) +endif() + +if(TARGET Qt${QT_VERSION_MAJOR}::QuickLayouts) + target_link_libraries(robotassistant PRIVATE Qt${QT_VERSION_MAJOR}::QuickLayouts) +endif() diff --git a/examples/quick3d/virtualassistant/imports/Constants/CMakeLists.txt b/examples/quick3d/virtualassistant/imports/Constants/CMakeLists.txt index bf73a134..635a2a78 100644 --- a/examples/quick3d/virtualassistant/imports/Constants/CMakeLists.txt +++ b/examples/quick3d/virtualassistant/imports/Constants/CMakeLists.txt @@ -13,5 +13,9 @@ qt_add_qml_module(Constants RESOURCE_PREFIX "/qt/qml" QML_FILES Constants.qml +) +target_link_libraries(Constants + PRIVATE + Qt${QT_VERSION_MAJOR}::Quick ) |