Fix dynamic linking Boost on Arch Linux (#6697)
Fix dynamic linking Boost Signed-off-by: Filipe Laíns <lains@riseup.net> Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
parent
ba1752680c
commit
5115ceb8f8
2 changed files with 2 additions and 4 deletions
|
@ -411,6 +411,8 @@ if(SLIC3R_STATIC)
|
||||||
set(Boost_USE_STATIC_LIBS ON)
|
set(Boost_USE_STATIC_LIBS ON)
|
||||||
# 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)
|
||||||
|
else()
|
||||||
|
add_definitions(-DBOOST_LOG_DYN_LINK)
|
||||||
endif()
|
endif()
|
||||||
#set(Boost_DEBUG ON)
|
#set(Boost_DEBUG ON)
|
||||||
# set(Boost_COMPILER "-mgw81")
|
# set(Boost_COMPILER "-mgw81")
|
||||||
|
|
|
@ -580,10 +580,6 @@ target_link_libraries(libslic3r
|
||||||
opencv_world
|
opencv_world
|
||||||
)
|
)
|
||||||
|
|
||||||
if(NOT SLIC3R_STATIC)
|
|
||||||
target_compile_definitions(libslic3r PUBLIC BOOST_ALL_DYN_LINK)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
target_link_libraries(libslic3r freetype)
|
target_link_libraries(libslic3r freetype)
|
||||||
if (NOT APPLE)
|
if (NOT APPLE)
|
||||||
|
|
Loading…
Reference in a new issue