From 22b820a7490dfa1e8da48889206db5cc6fcc4a45 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Fri, 18 Jul 2025 08:27:46 -0500 Subject: [PATCH] CMake: Explictly add QtOpenGLWidgets Necessary for manually-compiled Qt 6.9 builds. --- cMake/FreeCAD_Helpers/PrintFinalReport.cmake | 1 + cMake/FreeCAD_Helpers/SetupQt.cmake | 1 + src/Gui/CMakeLists.txt | 2 ++ 3 files changed, 4 insertions(+) diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake index be1078cc4c..bef4f83ebc 100644 --- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake +++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake @@ -166,6 +166,7 @@ macro(PrintFinalReport) simple(QtCore ${QtCore_VERSION}) simple(QtNetwork ${QtNetwork_VERSION}) conditional(QtOpenGL BUILD_GUI "not needed" ${QtOpenGL_VERSION}) + conditional(QtOpenGLWidgets BUILD_GUI "not needed" ${QtOpenGLWidgets_VERSION}) conditional(QtPrintSupport BUILD_GUI "not needed" ${QtPrintSupport_VERSION}) conditional(QtSvg BUILD_GUI "not needed" ${QtSvg_VERSION}) conditional(QtUiTools BUILD_GUI "not needed" ${QtUiTools_VERSION}) diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake index eba599830a..8a7ba9bdeb 100644 --- a/cMake/FreeCAD_Helpers/SetupQt.cmake +++ b/cMake/FreeCAD_Helpers/SetupQt.cmake @@ -13,6 +13,7 @@ if(BUILD_GUI) elseif (FREECAD_QT_MAJOR_VERSION EQUAL 6) list (APPEND FREECAD_QT_COMPONENTS GuiTools) list (APPEND FREECAD_QT_COMPONENTS SvgWidgets) + list (APPEND FREECAD_QT_COMPONENTS OpenGLWidgets) endif() list (APPEND FREECAD_QT_COMPONENTS OpenGL PrintSupport Svg UiTools Widgets LinguistTools) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index cce02afbc9..7913e6672d 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -128,6 +128,7 @@ target_include_directories( ${QtCore_INCLUDE_DIRS} ${QtWidgets_INCLUDE_DIRS} ${QtOpenGL_INCLUDE_DIRS} + ${QtOpenGLWidgets_INCLUDE_DIRS} ${QtPrintSupport_INCLUDE_DIRS} ${QtSvg_INCLUDE_DIRS} ${QtSvgWidgets_INCLUDE_DIRS} @@ -139,6 +140,7 @@ list(APPEND FreeCADGui_LIBS ${QtCore_LIBRARIES} ${QtWidgets_LIBRARIES} ${QtOpenGL_LIBRARIES} + ${QtOpenGLWidgets_LIBRARIES} ${QtPrintSupport_LIBRARIES} ${QtSvg_LIBRARIES} ${QtSvgWidgets_LIBRARIES}