From 3571812a3dec666981232d0c7b4f9c640b829ba0 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 25 Jul 2023 13:28:38 +0200 Subject: [PATCH] Fix cmake (follow-up to previous commit) --- src/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 949b9eac82..fec0d4cf70 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,15 +54,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 ()