From 2be23c8b149e4c4713707861f0528da06b9def59 Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Fri, 14 Dec 2018 13:45:58 +0100
Subject: [PATCH] Eliminate build warning with TBB_USE_CAPTURED_EXCEPTION

also make small adjustment on wxWidgets detection on Unix.
---
 src/CMakeLists.txt           | 13 ++++++++++++-
 src/libnest2d/CMakeLists.txt |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d714eb91a7..31c8013796 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,18 @@ endif()
 add_subdirectory(libslic3r)
 
 if (SLIC3R_GUI)
-    message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
+    if(WIN32)
+        message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
+    elseif(UNIX)
+        message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}")
+        set(wxWidgets_USE_UNICODE ON)
+        if(SLIC3R_STATIC)
+            set(wxWidgets_USE_STATIC ON)
+        else()
+            set(wxWidgets_USE_STATIC OFF)
+        endif()
+    endif()
+
     find_package(wxWidgets REQUIRED COMPONENTS base core adv html gl)
     include(${wxWidgets_USE_FILE})
 endif()
diff --git a/src/libnest2d/CMakeLists.txt b/src/libnest2d/CMakeLists.txt
index 163143bcbf..1faf542ddc 100644
--- a/src/libnest2d/CMakeLists.txt
+++ b/src/libnest2d/CMakeLists.txt
@@ -68,7 +68,7 @@ if(TBB_FOUND)
        target_compile_definitions(libnest2d INTERFACE -D__TBB_NO_IMPLICIT_LINKAGE)
     endif()
     # The Intel TBB library will use the std::exception_ptr feature of C++11.
-    target_compile_definitions(libnest2d INTERFACE -DTBB_USE_CAPTURED_EXCEPTION=1)
+    target_compile_definitions(libnest2d INTERFACE -DTBB_USE_CAPTURED_EXCEPTION=0)
 
     target_link_libraries(libnest2d INTERFACE tbb)
 else()