diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 66e492c3d..fbbaf323c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -205,22 +205,35 @@ add_executable(slic3r slic3r.cpp) #set_target_properties(slic3r PROPERTIES LINK_SEARCH_END_STATIC 1) -set(Boost_USE_STATIC_LIBS OFF) -set(Boost_USE_STATIC_RUNTIME OFF) +if(SLIC3R_STATIC) + set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_RUNTIME ON) +else(SLIC3R_STATIC) + set(Boost_USE_STATIC_LIBS OFF) + set(Boost_USE_STATIC_RUNTIME OFF) +endif(SLIC3R_STATIC) find_library(bsystem_l boost_system log) -add_library(bsystem SHARED IMPORTED) +if(SLIC3R_STATIC) + add_library(bsystem STATIC IMPORTED) +else(SLIC3R_STATIC) + add_library(bsystem SHARED IMPORTED) +endif(SLIC3R_STATIC) set_target_properties(bsystem PROPERTIES IMPORTED_LOCATION ${bsystem_l}) find_library(bthread_l boost_thread) +if(SLIC3R_STATIC) + add_library(bthread STATIC IMPORTED) +else(SLIC3R_STATIC) add_library(bthread SHARED IMPORTED) +endif(SLIC3R_STATIC) set_target_properties(bthread PROPERTIES IMPORTED_LOCATION ${bthread_l}) include_directories(${Boost_INCLUDE_DIRS}) -if(${SLIC3R_STATIC}) +if(SLIC3R_STATIC) set(wxWidgets_USE_STATIC ON) -else(${SLIC3R_STATIC}) +else(SLIC3R_STATIC) set(wxWidgets_USE_STATIC OFF) -endif(${SLIC3R_STATIC}) +endif(SLIC3R_STATIC) set(wxWidgets_USE_UNICODE ON)