From 1e28a93bcbcfe49064cf544df9e5daa2ce55d5ad Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Mon, 24 Jul 2023 10:39:27 +0200 Subject: [PATCH] Require wxWidgets>=3.2, mention wxGTK+EGL problems in readme --- doc/Dependencies.md | 2 +- doc/How to build - Linux et al.md | 2 ++ src/CMakeLists.txt | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/Dependencies.md b/doc/Dependencies.md index 5645e71695..075f35b3a9 100644 --- a/doc/Dependencies.md +++ b/doc/Dependencies.md @@ -1,7 +1,7 @@ # Dependency report for PrusaSlicer ## Possible dynamic linking on Linux * zlib: Strict dependency required from the system, linked dynamically. Many other libs depend on zlib. -* wxWidgets >= 3.1.6 +* wxWidgets >= 3.2 * libcurl * tbb * boost diff --git a/doc/How to build - Linux et al.md b/doc/How to build - Linux et al.md index de6e365fb9..0f4a6f7790 100644 --- a/doc/How to build - Linux et al.md +++ b/doc/How to build - Linux et al.md @@ -100,6 +100,8 @@ As already mentioned above, dynamic linking of dependencies is possible, but Pru The list of dependencies can be easily obtained by inspecting the CMake scripts in the `deps/` directory. Some of the dependencies don't have to be as recent as the versions listed - generally versions available on conservative Linux distros such as Debian stable, Ubuntu LTS releases or Fedora are likely sufficient. If you decide to build this way, it is your responsibility to make sure that CMake finds all required dependencies. It is possible to look at your distribution PrusaSlicer package to see how the package maintainers solved the dependency issues. +Note that you may need to use wxGTK with disabled EGL support for PrusaSlicer to work correctly: see [#9774](https://github.com/prusa3d/PrusaSlicer/issues/9774). + ## Miscellaneous ### Installation diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a335f2cde..949b9eac82 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,14 +49,14 @@ if (SLIC3R_GUI) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") set (wxWidgets_CONFIG_OPTIONS "--toolkit=gtk${SLIC3R_GTK}") - find_package(wxWidgets 3.1.6 QUIET COMPONENTS base core adv html gl) + find_package(wxWidgets 3.2 QUIET COMPONENTS base core adv html gl) if (NOT wxWidgets_FOUND) - message(FATAL_ERROR "Could not find wxWidgets >= 3.1.6") + message(FATAL_ERROR "Could not find wxWidgets >= 3.2") endif () include(${wxWidgets_USE_FILE}) else () - find_package(wxWidgets 3.1.6 COMPONENTS html adv gl core base) + find_package(wxWidgets 3.2 COMPONENTS html adv gl core base) if (NOT wxWidgets_FOUND) message(STATUS "Trying to find wxWidgets in CONFIG mode...") find_package(wxWidgets 3.1.6 CONFIG REQUIRED COMPONENTS html adv gl core base)