From deb49de7bc1bdbe42c6e2cb320bb018ed8fbe8e4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 12 Oct 2023 12:36:06 +0000 Subject: [PATCH] CMake: Fix Gui package to auto look up IntegrityPlatformGraphics v2 The previous attempt to record a dependency on the IntegrityPlatformGraphics target for the Gui target was insufficient. Aside from a qt_find_package(PROVIDED_TARGETS) call, we also need to use qt_internal_extend_target(Gui PRIVATE IntegrityPlatformGraphics) to ensure the dependency is written into the Qt6GuiDependencies.cmake file. Replace the target_link_libraries call with qt_internal_extend_target, and remove the qt_find_package all together. A qt_find_package call in src/gui/configure.cmake already exists, so the one in CMakeLists.txt is redundant and can be removed. Finally the qt_internal_extend_target(Gui PRIVATE IntegrityPlatformGraphics) call will also result in a target_link_libraries(Gui INTERFACE $) because Gui is a static library when building on Integrity, so the transitive requirement will still be passed along to user projects. Amends c03eb94c8a4c776a0315acc35538b3954e031222 Amends 8116fdde1c13fe00fb03414b56da2d66e215f279 Fixes: QTBUG-118051 Task-number: QTBUG-102883 Change-Id: Ic962df94a20071d3f2459e705dbafaca0319a638 Reviewed-by: Qt CI Bot Reviewed-by: Joerg Bornemann (cherry picked from commit 8170e9e85a6e479ad3d2d1f2645f9bc148ab6fde) Reviewed-by: Qt Cherry-pick Bot --- src/gui/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index b9c300f8bcc..4b7692e5170 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -336,10 +336,10 @@ if(QT_FEATURE_opengl) target_link_libraries(Gui PUBLIC GLESv2::GLESv2) if(INTEGRITY AND _qt_igy_gui_libs) - qt_find_package(IntegrityPlatformGraphics - PROVIDED_TARGETS IntegrityPlatformGraphics::IntegrityPlatformGraphics) - target_link_libraries(Gui - INTERFACE $) + qt_internal_extend_target(Gui + LIBRARIES + IntegrityPlatformGraphics::IntegrityPlatformGraphics + ) endif() elseif(NOT QT_FEATURE_opengl_dynamic)