diff --git a/pkgs/applications/misc/prusa-slicer/eigen.patch b/pkgs/applications/misc/prusa-slicer/eigen.patch index df57f2fb304e5..fd5776b998eea 100644 --- a/pkgs/applications/misc/prusa-slicer/eigen.patch +++ b/pkgs/applications/misc/prusa-slicer/eigen.patch @@ -1,25 +1,32 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31cb4c0ff..400acc6e1 100644 +index 31cb4c0ff..42c38102c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -248,4 +248,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") +@@ -247,6 +247,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + find_package(Threads REQUIRED) find_package(DBus REQUIRED) + pkg_check_modules(DBUS REQUIRED dbus-1) + include_directories(${DBUS_INCLUDE_DIRS}) endif() -@@ -348,5 +350,5 @@ if(WIN32) + if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX) +@@ -347,7 +349,7 @@ if(WIN32) + add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) if(MSVC) # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking. - add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -DBOOST_SYSTEM_USE_UTF8 ) + add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -DBOOST_SYSTEM_USE_UTF8 -DBOOST_LOG_DYN_LINK) # Force the source code encoding to UTF-8. See PrusaSlicer GH pull request #5583 add_compile_options("$<$:/utf-8>") -@@ -372,8 +374,9 @@ endif() + add_compile_options("$<$:/utf-8>") +@@ -371,10 +373,13 @@ endif() + # boost::process was introduced first in version 1.64.0, # boost::beast::detail::base64 was introduced first in version 1.66.0 set(MINIMUM_BOOST_VERSION "1.66.0") -set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide") ++# set(Boost_USE_STATIC_LIBS ON) ++find_package(Boost REQUIRED COMPONENTS log) +set(_boost_components "system;filesystem;thread;log;log_setup;locale;regex;chrono;atomic;date_time;iostreams;nowide") find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components}) +include_directories(${BOOST_INCLUDE_DIRS}) @@ -28,31 +35,36 @@ index 31cb4c0ff..400acc6e1 100644 +find_package(Eigen3 3.3.7 REQUIRED NO_MODULE) add_library(boost_libs INTERFACE) + add_library(boost_headeronly INTERFACE) diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt -index 78369233d..bfdcc708b 100644 +index 78369233d..1f9c40aaf 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt -@@ -384,4 +384,5 @@ set(SLIC3R_GUI_SOURCES +@@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES + ) find_package(NanoSVG REQUIRED) +find_package(OpenSSL REQUIRED) if (APPLE) -@@ -439,4 +440,7 @@ target_link_libraries( + list(APPEND SLIC3R_GUI_SOURCES +@@ -438,6 +439,9 @@ target_link_libraries( + NanoSVG::nanosvgrast stb_dxt fastfloat -+ Boost::Log ++ Boost::log + OpenSSL::SSL + OpenSSL::Crypto ) + if (MSVC) diff --git a/tests/sla_print/CMakeLists.txt b/tests/sla_print/CMakeLists.txt index b244e76ac..b23f6d4bc 100644 --- a/tests/sla_print/CMakeLists.txt +++ b/tests/sla_print/CMakeLists.txt -@@ -19,2 +19,4 @@ endif() +@@ -18,3 +18,5 @@ endif() + # catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ") add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests ${CATCH_EXTRA_ARGS}) + +add_definitions(-DBOOST_LOG_DYN_LINK) -