From c0b9dc00145a6d2123b99ab8b1de692af5ead39a Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 24 Sep 2024 01:16:08 +0200 Subject: [PATCH] Add the missing check of IntegrityPlatformGraphics_REQUIRED_LIBRARIES This will allow merging the updated toolchain, otherwise qt5 fails to find OpenGL and friends. The whole block will be removed once the toolchain file is merged. Pick-to: 6.8 Task-number: QTBUG-128455 Change-Id: If355b1c6360dba7b3567023430785c6d109f9fe8 Reviewed-by: Alexandru Croitor --- cmake/platforms/FindIntegrityPlatformGraphics.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/platforms/FindIntegrityPlatformGraphics.cmake b/cmake/platforms/FindIntegrityPlatformGraphics.cmake index f210e84674a..87e2af1fb1d 100644 --- a/cmake/platforms/FindIntegrityPlatformGraphics.cmake +++ b/cmake/platforms/FindIntegrityPlatformGraphics.cmake @@ -7,7 +7,9 @@ # Temporary fall back to allow integrating this pachset without the # toolchain file updated. -set(IntegrityPlatformGraphics_REQUIRED_LIBRARIES ${_qt_igy_gui_libs}) +if(NOT IntegrityPlatformGraphics_REQUIRED_LIBRARIES) + set(IntegrityPlatformGraphics_REQUIRED_LIBRARIES ${_qt_igy_gui_libs}) +endif() find_package_handle_standard_args(IntegrityPlatformGraphics FOUND_VAR