gui: link with OpenGL framework

qopengl.h pulls in headers from the OpenGL framework on macos when opengl is enabled. We should therefore also link the OpenGL framework. fixes linker error in libqcocoa: Undefined symbols for architecture x86_64: "_glGetIntegerv", referenced from: QCocoaGLContext::updateSurfaceFormat() in libqcocoa.a(qcocoaglcontext.mm.o) "_glGetString", referenced from: QCocoaGLContext::updateSurfaceFormat() in libqcocoa.a(qcocoaglcontext.mm.o) Change-Id: I02d2c80e2652da0cf16eaca7ab161cf711599dc2 Pick-to: 6.9 6.8 6.5 Reviewed-by: Tor Arne Vestbø <[email protected]>
isolovev · Dec 19, 2024 · 6f41c16 · 6f41c16
1 parent d983a40
commit 6f41c16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/cmake/QtFrameworkHelpers.cmake b/cmake/QtFrameworkHelpers.cmake
@@ -39,6 +39,7 @@ macro(qt_find_apple_system_frameworks)
         qt_internal_find_apple_system_framework(FWHealthKit HealthKit)
         qt_internal_find_apple_system_framework(FWUniformTypeIdentifiers UniformTypeIdentifiers)
         qt_internal_find_apple_system_framework(FWNetwork Network)
+        qt_internal_find_apple_system_framework(FWOpenGL OpenGL)
     endif()
 endmacro()
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -400,6 +400,11 @@ qt_internal_extend_target(Gui CONDITION MACOS
         ${FWAppKit}
 )
 
+qt_internal_extend_target(Gui CONDITION MACOS AND QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        ${FWOpenGL}
+)
+
 qt_internal_extend_target(Gui CONDITION UIKIT
     SOURCES
         platform/ios/qiosnativeinterface.cpp