Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

src/libslic3r/CMakeLists.txt

@@ -9,6 +9,11 @@ if (MINGW)
     add_compile_options(-Wa,-mbig-obj)
 endif ()
 
+set(OpenVDBUtils_SOURCES "")
+if (TARGET OpenVDB::openvdb)
+    set(OpenVDBUtils_SOURCES OpenVDBUtils.cpp OpenVDBUtils.hpp)
+endif()
+
 add_library(libslic3r STATIC
     pchheader.cpp
     pchheader.hpp
@@ -116,6 +121,8 @@ add_library(libslic3r STATIC
     Line.hpp
     Model.cpp
     Model.hpp
+    CustomGCode.cpp
+    CustomGCode.hpp
     Arrange.hpp
     Arrange.cpp
     MotionPlanner.cpp
@@ -149,9 +156,9 @@ add_library(libslic3r STATIC
     ShortestPath.cpp
     ShortestPath.hpp
     SLAPrint.cpp
+    SLAPrintSteps.cpp
+    SLAPrintSteps.hpp
     SLAPrint.hpp
-    SLA/SLAAutoSupports.hpp
-    SLA/SLAAutoSupports.cpp
     Slicing.cpp
     Slicing.hpp
     SlicingAdaptive.cpp
@@ -180,35 +187,80 @@ add_library(libslic3r STATIC
     MinAreaBoundingBox.cpp
     miniz_extension.hpp
     miniz_extension.cpp
-    SLA/SLACommon.hpp
-    SLA/SLABoilerPlate.hpp
-    SLA/SLAPad.hpp
-    SLA/SLAPad.cpp
-    SLA/SLASupportTreeBuilder.hpp
-    SLA/SLASupportTreeBuildsteps.hpp
-    SLA/SLASupportTreeBuildsteps.cpp
-    SLA/SLASupportTreeBuilder.cpp
-    SLA/SLAConcurrency.hpp
-    SLA/SLASupportTree.hpp
-    SLA/SLASupportTree.cpp
-    SLA/SLASupportTreeIGL.cpp
-    SLA/SLARotfinder.hpp
-    SLA/SLARotfinder.cpp
-    SLA/SLABoostAdapter.hpp
-    SLA/SLASpatIndex.hpp
-    SLA/SLARaster.hpp
-    SLA/SLARaster.cpp
-    SLA/SLARasterWriter.hpp
-    SLA/SLARasterWriter.cpp
+    SimplifyMesh.hpp
+    SimplifyMeshImpl.hpp
+    SimplifyMesh.cpp
+    ${OpenVDBUtils_SOURCES}
+    SLA/Common.hpp
+    SLA/Common.cpp
+    SLA/Pad.hpp
+    SLA/Pad.cpp
+    SLA/SupportTreeBuilder.hpp
+    SLA/SupportTreeBuildsteps.hpp
+    SLA/SupportTreeBuildsteps.cpp
+    SLA/SupportTreeBuilder.cpp
+    SLA/Concurrency.hpp
+    SLA/SupportTree.hpp
+    SLA/SupportTree.cpp
+#    SLA/SupportTreeIGL.cpp
+    SLA/Rotfinder.hpp
+    SLA/Rotfinder.cpp
+    SLA/BoostAdapter.hpp
+    SLA/SpatIndex.hpp
+    SLA/Raster.hpp
+    SLA/Raster.cpp
+    SLA/RasterWriter.hpp
+    SLA/RasterWriter.cpp
     SLA/ConcaveHull.hpp
     SLA/ConcaveHull.cpp
+    SLA/Hollowing.hpp
+    SLA/Hollowing.cpp
+    SLA/JobController.hpp
+    SLA/SupportPoint.hpp
+    SLA/SupportPointGenerator.hpp
+    SLA/SupportPointGenerator.cpp
+    SLA/Contour3D.hpp
+    SLA/Contour3D.cpp
+    SLA/EigenMesh3D.hpp
+    SLA/Clustering.hpp
 )
 
-encoding_check(libslic3r)
-
-if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
-    add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE)
+if (SLIC3R_STATIC)
+    set(CGAL_Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE)
 endif ()
+set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE ON CACHE BOOL "" FORCE)
+
+cmake_policy(PUSH)
+cmake_policy(SET CMP0011 NEW)
+find_package(CGAL REQUIRED)
+cmake_policy(POP)
+
+add_library(libslic3r_cgal STATIC MeshBoolean.cpp MeshBoolean.hpp)
+target_include_directories(libslic3r_cgal PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
+# Reset compile options of libslic3r_cgal. Despite it being linked privately, CGAL options
+# (-frounding-math) still propagate to dependent libs which is not desired.
+get_target_property(_cgal_tgt CGAL::CGAL ALIASED_TARGET)
+if (NOT TARGET ${_cgal_tgt})
+    set (_cgal_tgt CGAL::CGAL)
+endif ()
+get_target_property(_opts ${_cgal_tgt} INTERFACE_COMPILE_OPTIONS)
+if (_opts)
+    set(_opts_bad "${_opts}")
+    set(_opts_good "${_opts}")
+    list(FILTER _opts_bad INCLUDE REGEX frounding-math)
+    list(FILTER _opts_good EXCLUDE REGEX frounding-math)
+    set_target_properties(${_cgal_tgt} PROPERTIES INTERFACE_COMPILE_OPTIONS "${_opts_good}")
+    target_compile_options(libslic3r_cgal PRIVATE "${_opts_bad}")
+endif()
+
+target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} libigl)
+
+if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround
+    target_compile_definitions(libslic3r_cgal PRIVATE CGAL_DO_NOT_USE_MPZF)
+endif ()
+
+encoding_check(libslic3r)
 
 target_compile_definitions(libslic3r PUBLIC -DUSE_TBB -DTBB_USE_CAPTURED_EXCEPTION=0)
 target_include_directories(libslic3r PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LIBNEST2D_INCLUDES} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
@@ -228,10 +280,14 @@ target_link_libraries(libslic3r
     qhull
     semver
     TBB::tbb
-    # OpenVDB::openvdb
+    libslic3r_cgal
     ${CMAKE_DL_LIBS}
     )
 
+if (TARGET OpenVDB::openvdb)
+    target_link_libraries(libslic3r OpenVDB::openvdb)
+endif()
+
 if(WIN32)
     target_link_libraries(libslic3r Psapi.lib)
 endif()
@@ -239,3 +295,7 @@ endif()
 if(SLIC3R_PROFILE)
     target_link_libraries(slic3r Shiny)
 endif()
+
+if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
+    add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE)
+endif ()