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

Fix cmake (follow-up to previous commit)

Browse Source
This commit is contained in:
Lukas Matena 2023-07-25 13:28:38 +02:00
parent 1e28a93bcb
commit 3571812a3d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -54,17 +54,21 @@ if (SLIC3R_GUI)
message(FATAL_ERROR "Could not find wxWidgets >= 3.2") message(FATAL_ERROR "Could not find wxWidgets >= 3.2")
endif () endif ()
if (NOT "${wxWidgets_USE_FILE}" STREQUAL "")
include(${wxWidgets_USE_FILE}) include(${wxWidgets_USE_FILE})
endif ()
else () else ()
find_package(wxWidgets 3.2 COMPONENTS html adv gl core base) find_package(wxWidgets 3.2 COMPONENTS html adv gl core base)
if (NOT wxWidgets_FOUND) if (NOT wxWidgets_FOUND)
message(STATUS "Trying to find wxWidgets in CONFIG mode...") 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) slic3r_remap_configs(wx::wxhtml wx::wxadv wx::wxgl wx::wxcore wx::wxbase RelWithDebInfo Release)
else () else ()
if (NOT "${wxWidgets_USE_FILE}" STREQUAL "")
include(${wxWidgets_USE_FILE}) include(${wxWidgets_USE_FILE})
endif () endif ()
endif () endif ()
endif ()
if(UNIX) if(UNIX)
message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}") message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}")