From 7de8fbb0da280e683da110737b8bb8e97959eafc Mon Sep 17 00:00:00 2001 From: SoftFever Date: Wed, 25 Mar 2026 11:28:23 +0800 Subject: [PATCH] Remove _wx_opengl_override from wxWidgets dep cmake wxWidgets 3.3 handles OpenGL discovery natively via imported targets (OpenGL::GL, OpenGL::OpenGL). The override was corrupting wx-config output with malformed "-framework OpenGL" entries, causing FindwxWidgets.cmake to fail. --- deps/wxWidgets/wxWidgets.cmake | 9 --------- 1 file changed, 9 deletions(-) diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index 9fe1ec554f..41cdaab2c2 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -21,14 +21,6 @@ else () set(_wx_edge "-DwxUSE_WEBVIEW_EDGE=OFF") endif () -set(_wx_opengl_override "") -if(APPLE AND CMAKE_VERSION VERSION_GREATER_EQUAL "4.0") - set(_wx_opengl_override - -DOPENGL_gl_LIBRARY="-framework OpenGL" - -DOPENGL_glu_LIBRARY="-framework OpenGL" - ) -endif() - orcaslicer_add_cmake_project( wxWidgets GIT_REPOSITORY "https://github.com/SoftFever/Orca-deps-wxWidgets" @@ -36,7 +28,6 @@ orcaslicer_add_cmake_project( GIT_SHALLOW ON DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} ${JPEG_PKG} CMAKE_ARGS - ${_wx_opengl_override} -DwxBUILD_PRECOMP=ON ${_wx_toolkit} "-DCMAKE_DEBUG_POSTFIX:STRING=${_wx_debug_postfix}"