viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 9 Packages Projects Releases 6 Wiki Activity

fix(stable): wx 3.3 CONFIG-Modus auf Windows (wxWidgets_DIR statt WXWIN)

Browse Source 
Der Modul-Modus von find_package(wxWidgets) ignoriert wxWidgets_DIR und
sucht nur WXWIN/wx-config, das auf dem Windows-Builder leer ist. wx 3.3
liefert CMake-Config-Files; CONFIG-Modus nutzt sie wie im 2.4-Branch.
wxWidgets_USE_FILE wird im CONFIG-Modus nicht gesetzt -> include gewrappt.
This commit is contained in:
thysson2701
2026-06-12 20:19:36 +02:00
parent 7c57d94ac0
commit 64801faff3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CMakeLists.txt
View File

@@ -36,14 +36,21 @@ if (SLIC3R_GUI)
find_package(wxWidgets 3.1 REQUIRED COMPONENTS base core adv html gl aui net media webview)
endif ()
else ()
find_package(wxWidgets 3.1 REQUIRED COMPONENTS html adv gl core base webview aui net media)
# wxWidgets 3.3 ships CMake config files; use CONFIG mode so wxWidgets_DIR
# is honored. The legacy FindwxWidgets module ignores wxWidgets_DIR and
# only probes WXWIN/wx-config, which is unset on the Windows builder.
find_package(wxWidgets 3.3 CONFIG REQUIRED COMPONENTS html adv gl core base webview aui net media)
endif ()
if(UNIX)
message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}")
endif()
include(${wxWidgets_USE_FILE})
# CONFIG mode (Windows, wx 3.3) does not set wxWidgets_USE_FILE; only the
# legacy module mode (Linux wx-config) does. Guard the include accordingly.
if(wxWidgets_USE_FILE)
include(${wxWidgets_USE_FILE})
endif()
find_package(JPEG QUIET)