3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 07:34:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix boost_log_setup link errors on libslic3r_cgal (#6690)

Browse source 
Signed-off-by: Filipe Laíns <lains@riseup.net>
Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
Filipe Laíns 🇵🇸 2024-12-24 14:18:33 +00:00 • committed by GitHub
parent cf1039be36
commit aa1f1dfcc0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -418,7 +418,7 @@ endif()
# set(Boost_COMPILER "-mgw81") # set(Boost_COMPILER "-mgw81")
# boost::process was introduced first in version 1.64.0, # boost::process was introduced first in version 1.64.0,
# boost::beast::detail::base64 was introduced first in version 1.66.0 # boost::beast::detail::base64 was introduced first in version 1.66.0
find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options) find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log log_setup locale regex chrono atomic date_time iostreams program_options)
add_library(boost_libs INTERFACE) add_library(boost_libs INTERFACE)
add_library(boost_headeronly INTERFACE) add_library(boost_headeronly INTERFACE)

2
src/libslic3r/CMakeLists.txt
View file

@ -503,7 +503,7 @@ if (_opts)
target_compile_options(libslic3r_cgal PRIVATE "${_opts_bad}") target_compile_options(libslic3r_cgal PRIVATE "${_opts_bad}")
endif() endif()
target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} libigl mcut) target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} libigl mcut boost_libs)
if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround
target_compile_definitions(libslic3r_cgal PRIVATE CGAL_DO_NOT_USE_MPZF) target_compile_definitions(libslic3r_cgal PRIVATE CGAL_DO_NOT_USE_MPZF)