From 5115ceb8f876e9921e6d8d24666e39f3e8a831d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filipe=20La=C3=ADns=20=F0=9F=87=B5=F0=9F=87=B8?= Date: Tue, 24 Dec 2024 07:40:55 +0000 Subject: [PATCH] Fix dynamic linking Boost on Arch Linux (#6697) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix dynamic linking Boost Signed-off-by: Filipe Laíns Co-authored-by: SoftFever --- CMakeLists.txt | 2 ++ src/libslic3r/CMakeLists.txt | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47a4fba3c..03b566ec3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,6 +411,8 @@ if(SLIC3R_STATIC) set(Boost_USE_STATIC_LIBS ON) # Use boost libraries linked statically to the C++ runtime. # set(Boost_USE_STATIC_RUNTIME ON) +else() + add_definitions(-DBOOST_LOG_DYN_LINK) endif() #set(Boost_DEBUG ON) # set(Boost_COMPILER "-mgw81") diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 2c362dba2..81fe5b58e 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -580,10 +580,6 @@ target_link_libraries(libslic3r opencv_world ) -if(NOT SLIC3R_STATIC) - target_compile_definitions(libslic3r PUBLIC BOOST_ALL_DYN_LINK) -endif() - if(NOT WIN32) target_link_libraries(libslic3r freetype) if (NOT APPLE)