Merge branch 'master' into pm_support_spots_generator

src/libslic3r/CMakeLists.txt

@@ -258,6 +258,10 @@ set(SLIC3R_SOURCES
     Technologies.hpp
     Tesselate.cpp
     Tesselate.hpp
+    TreeSupport.cpp
+    TreeSupport.hpp
+    TreeModelVolumes.cpp
+    TreeModelVolumes.hpp
     TriangleMesh.cpp
     TriangleMesh.hpp
     TriangleMeshSlicer.cpp
@@ -461,10 +465,6 @@ if(WIN32)
     target_link_libraries(libslic3r Psapi.lib)
 endif()
 
-if(SLIC3R_PROFILE)
-    target_link_libraries(libslic3r Shiny)
-endif()
-
 if (APPLE)
     # This flag prevents the need for minimum SDK version 10.14
     # currently, PS targets v10.12