Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview

This commit is contained in:
Enrico Turri 2018-03-05 08:41:56 +01:00
commit b2de3dd241

View File

@ -475,6 +475,7 @@ if(SLIC3R_STATIC)
# Use boost libraries linked statically to the C++ runtime. # Use boost libraries linked statically to the C++ runtime.
# set(Boost_USE_STATIC_RUNTIME ON) # set(Boost_USE_STATIC_RUNTIME ON)
endif() endif()
#set(Boost_DEBUG ON)
find_package(Boost REQUIRED COMPONENTS system filesystem thread log locale regex) find_package(Boost REQUIRED COMPONENTS system filesystem thread log locale regex)
if(Boost_FOUND) if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})