GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 02:35:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_spe1784_binary_gcode

Browse Source
This commit is contained in:
enricoturri1966 2023-07-25 13:37:24 +02:00
commit 32eebf85e0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CMakeLists.txt
View File

@ -55,15 +55,19 @@ if (SLIC3R_GUI)
message(FATAL_ERROR "Could not find wxWidgets >= 3.2")
endif ()
include(${wxWidgets_USE_FILE})
if (NOT "${wxWidgets_USE_FILE}" STREQUAL "")
include(${wxWidgets_USE_FILE})
endif ()
else ()
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)
find_package(wxWidgets 3.2 CONFIG REQUIRED COMPONENTS html adv gl core base)
slic3r_remap_configs(wx::wxhtml wx::wxadv wx::wxgl wx::wxcore wx::wxbase RelWithDebInfo Release)
else ()
include(${wxWidgets_USE_FILE})
if (NOT "${wxWidgets_USE_FILE}" STREQUAL "")
include(${wxWidgets_USE_FILE})
endif ()
endif ()
endif ()