From 3af915719d6c98e544f6fb2be99b627eecc9b672 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 13 May 2018 13:37:04 -0500 Subject: [PATCH] don't build WX if it can't be found --- src/CMakeLists.txt | 1 + src/slic3r.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 07da56259..d423ed8b5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -219,6 +219,7 @@ IF(wxWidgets_FOUND) target_compile_features(slic3r_gui PUBLIC cxx_std_11) #only build GUI lib if building with wx target_link_libraries (slic3r slic3r_gui ${wxWidgets_LIBRARIES}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_WX") ELSE(wxWidgets_FOUND) # For convenience. When we cannot continue, inform the user MESSAGE("wx not found!") diff --git a/src/slic3r.cpp b/src/slic3r.cpp index 2e8aaf387..6d3470c83 100644 --- a/src/slic3r.cpp +++ b/src/slic3r.cpp @@ -13,7 +13,11 @@ #include #include #include -#include "GUI/GUI.hpp" + + +#ifdef USE_WX + #include "GUI/GUI.hpp" +#endif using namespace Slic3r; @@ -41,6 +45,7 @@ main(int argc, char **argv) DynamicPrintConfig print_config; +#ifdef USE_WX std::shared_ptr gui_config = std::make_shared(); GUI::App *gui = new GUI::App(gui_config); @@ -49,7 +54,7 @@ main(int argc, char **argv) GUI::App::SetInstance(gui); wxEntry(argc, argv); - +#endif // load config files supplied via --load for (const std::string &file : cli_config.load.values) { if (!boost::filesystem::exists(file)) {