Merge branch 'master' into tm_arrange_selection

src/libslic3r/CMakeLists.txt

@@ -81,9 +81,8 @@ add_library(libslic3r STATIC
     GCode/SpiralVase.hpp
     GCode/ToolOrdering.cpp
     GCode/ToolOrdering.hpp
+    GCode/WipeTower.cpp
     GCode/WipeTower.hpp
-    GCode/WipeTowerPrusaMM.cpp
-    GCode/WipeTowerPrusaMM.hpp
     GCode.cpp
     GCode.hpp
     GCodeReader.cpp
@@ -114,6 +113,8 @@ add_library(libslic3r STATIC
     MultiPoint.cpp
     MultiPoint.hpp
     MutablePriorityQueue.hpp
+    ObjectID.cpp
+    ObjectID.hpp
     PerimeterGenerator.cpp
     PerimeterGenerator.hpp
     PlaceholderParser.cpp
@@ -189,6 +190,7 @@ target_include_directories(libslic3r PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LIBNE
 target_link_libraries(libslic3r
     libnest2d
     admesh
+    cereal
     libigl
     miniz
     boost_libs