From 46edadb0cd271e514bbaa585a7ecdc070b5789a4 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Fri, 4 May 2018 23:52:25 -0500 Subject: [PATCH] Look for static wxwidgets and static boost if SLIC3R_STATIC is defined. --- src/CMakeLists.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cf8958389..86753350d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,8 +24,14 @@ ELSE(CMAKE_HOST_APPLE) # set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -L.") ENDIF(CMAKE_HOST_APPLE) -set(Boost_USE_STATIC_LIBS OFF) -set(Boost_USE_STATIC_RUNTIME OFF) +if(DEFINED ENV{SLIC3R_STATIC}) + set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_RUNTIME ON) +else(DEFINED ENV{SLIC3R_STATIC}) + set(Boost_USE_STATIC_LIBS OFF) + set(Boost_USE_STATIC_RUNTIME OFF) +endif(DEFINED ENV{SLIC3R_STATIC}) + find_package(Threads REQUIRED) find_package(Boost COMPONENTS system thread filesystem) @@ -154,7 +160,12 @@ add_library(bthread SHARED IMPORTED) set_target_properties(bthread PROPERTIES IMPORTED_LOCATION ${bthread_l}) include_directories(${Boost_INCLUDE_DIRS}) -set(wxWidgets_USE_STATIC OFF) +if(DEFINED ENV{SLIC3R_STATIC}) + set(wxWidgets_USE_STATIC ON) +ELSE(DEFINED ENV{SLIC3R_STATIC}) + set(wxWidgets_USE_STATIC OFF) +ENDIF(DEFINED ENV{SLIC3R_STATIC}) + set(wxWidgets_USE_UNICODE ON) find_package(wxWidgets COMPONENTS base aui core html)