Fixes 50 Compiler Warnings: Add SYSTEM toCMakeLists.txt (#10653)

* src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* src/*/CMakeLists.txt: removes duplicate sources from lisbslic3r_sources and SLIC3R_GUI_SOURCES"

* .gititnore: adds CMakeLists.txt.user and CMakeLists.txt.autosave

* deps_src/*/CMakeLists.txt: adds SYSTEM to arget_include_directories()

* removes #pragma once from .cpp file

.gitignore

@@ -1,6 +1,8 @@
 Build
 Build.bat
 /build*/
+CMakeLists.txt.user
+**/CMakeLists.txt.autosave
 deps/build*
 MYMETA.json
 MYMETA.yml
@@ -36,4 +38,4 @@ src/OrcaSlicer-doc/
 **/.flatpak-builder/
 resources/profiles/user/default
 *.code-workspace
-deps_src/build/
+deps_src/build/

deps_src/CMakeLists.txt

@@ -32,4 +32,4 @@ add_subdirectory(qoi)
 add_subdirectory(semver)      # Semver static library
 
 # Eigen header-only library
-add_subdirectory(eigen)
+add_subdirectory(eigen)

deps_src/Shiny/CMakeLists.txt

@@ -24,6 +24,7 @@ add_library(Shiny STATIC
     ShinyZone.h
 )
 
-target_include_directories(Shiny PUBLIC
+target_include_directories(Shiny SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )

deps_src/admesh/CMakeLists.txt

@@ -11,9 +11,10 @@ add_library(admesh STATIC
     util.cpp
 )
 
-target_include_directories(admesh PUBLIC
+target_include_directories(admesh SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/..
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
 target_link_libraries(admesh 

deps_src/agg/CMakeLists.txt

@@ -3,8 +3,9 @@ project(agg)
 
 add_library(agg INTERFACE)
 
-target_include_directories(agg INTERFACE
+target_include_directories(agg SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_sources(agg INTERFACE
@@ -32,4 +33,4 @@ target_sources(agg INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/agg_rendering_buffer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/agg_scanline_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/agg_trans_affine.h
-)
+)

deps_src/ankerl/CMakeLists.txt

@@ -3,10 +3,11 @@ project(ankerl)
 
 add_library(ankerl INTERFACE)
 
-target_include_directories(ankerl INTERFACE
+target_include_directories(ankerl SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_sources(ankerl INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/unordered_dense.h
-)
+)

deps_src/clipper/CMakeLists.txt

@@ -9,8 +9,9 @@ add_library(clipper STATIC
     clipper_z.hpp
 )
 
-target_include_directories(clipper PUBLIC
+target_include_directories(clipper SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_link_libraries(clipper 

deps_src/eigen/CMakeLists.txt

@@ -3,9 +3,10 @@ project(eigen)
 
 add_library(eigen INTERFACE)
 
-target_include_directories(eigen INTERFACE
+target_include_directories(eigen SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 # Eigen is header-only, so we only need to specify the include directory
-# The headers are in the Eigen/ subdirectory structure
+# The headers are in the Eigen/ subdirectory structure

deps_src/expat/CMakeLists.txt

@@ -7,8 +7,9 @@ add_library(expat STATIC
     xmltok.c
 )
 
-target_include_directories(expat PUBLIC
+target_include_directories(expat SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_sources(expat PRIVATE
@@ -33,4 +34,4 @@ endif()
 
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
     target_compile_options(expat PRIVATE -Wno-unused-parameter)
-endif()
+endif()

deps_src/fast_float/CMakeLists.txt

@@ -3,8 +3,9 @@ project(fast_float)
 
 add_library(fast_float INTERFACE)
 
-target_include_directories(fast_float INTERFACE
+target_include_directories(fast_float SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_sources(fast_float INTERFACE
@@ -12,4 +13,4 @@ target_sources(fast_float INTERFACE
 )
 
 # Require C++14 for fast_float
-target_compile_features(fast_float INTERFACE cxx_std_14)
+target_compile_features(fast_float INTERFACE cxx_std_14)

deps_src/glu-libtess/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 
 project(glu-libtess)
 
-add_library(glu-libtess STATIC 
+add_library(glu-libtess STATIC
 	src/dict-list.h
 	src/dict.c
 	src/dict.h
@@ -34,4 +34,8 @@ if(UNIX)
     target_link_libraries(glu-libtess m)
 endif(UNIX)
 
-target_include_directories(glu-libtess PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(glu-libtess SYSTEM
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include)

deps_src/hidapi/CMakeLists.txt

@@ -11,7 +11,12 @@ endif()
 include_directories(include)
 
 add_library(hidapi STATIC ${HIDAPI_IMPL})
-target_include_directories(hidapi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(hidapi SYSTEM
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+    )
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	# Don't link the udev library, as there are two versions out there (libudev.so.0, libudev.so.1), so they are linked explicitely.

deps_src/hints/CMakeLists.txt

@@ -11,8 +11,8 @@ add_executable(hintsToPot
     HintsToPot.cpp)
 
 # Set include directories for the executable
-target_include_directories(hintsToPot 
+target_include_directories(hintsToPot SYSTEM
-    PRIVATE 
+    PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
@@ -25,7 +25,7 @@ endif()
 add_library(hints INTERFACE)
 
 # Set include directories for the interface library
-target_include_directories(hints 
+target_include_directories(hints SYSTEM
     INTERFACE 
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<INSTALL_INTERFACE:include>

deps_src/imgui/CMakeLists.txt

@@ -19,8 +19,9 @@ add_library(imgui STATIC
     imstb_truetype.h
 )
 
-target_include_directories(imgui PUBLIC
+target_include_directories(imgui SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 if(Boost_FOUND)

deps_src/imguizmo/CMakeLists.txt

@@ -7,9 +7,11 @@ add_library(imguizmo STATIC
     ImGuizmo.cpp
 )
 
-target_include_directories(imguizmo 
+target_include_directories(imguizmo SYSTEM
-    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+    PUBLIC
-    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
 target_link_libraries(imguizmo PUBLIC imgui)

deps_src/libigl/CMakeLists.txt

@@ -11,5 +11,7 @@ if(libigl_FOUND)
     target_link_libraries(libigl INTERFACE igl::core)
 else()
     message(STATUS "IGL NOT found, using bundled version...")
-    target_include_directories(libigl SYSTEM BEFORE INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+    target_include_directories(libigl SYSTEM BEFORE
+        INTERFACE
+            ${CMAKE_CURRENT_SOURCE_DIR})
 endif()

deps_src/libnest2d/CMakeLists.txt

@@ -23,6 +23,6 @@ set(LIBNEST2D_SRCFILES
 
 add_library(libnest2d STATIC ${LIBNEST2D_SRCFILES})
 
-target_include_directories(libnest2d PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(libnest2d SYSTEM PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
 target_link_libraries(libnest2d PUBLIC NLopt::nlopt TBB::tbb Boost::boost libslic3r)
 target_compile_definitions(libnest2d PUBLIC LIBNEST2D_THREADING_tbb LIBNEST2D_STATIC LIBNEST2D_OPTIMIZER_nlopt LIBNEST2D_GEOMETRIES_libslic3r)

deps_src/mcut/CMakeLists.txt

@@ -176,7 +176,7 @@ function(create_library_target LIBRARY_TYPE)
 	
 	add_library(${target_name} ${LIBRARY_TYPE} ${project_source_files})
 
-	target_include_directories(${target_name} PRIVATE ${include_dirs})
+        target_include_directories(${target_name} SYSTEM PRIVATE ${include_dirs})
 	target_link_libraries(${target_name} PRIVATE ${extra_libs})
 	target_compile_options(${target_name} PRIVATE ${compilation_flags})
 	target_compile_definitions(${target_name} PRIVATE ${preprocessor_defs} )
@@ -414,4 +414,4 @@ endif ()
 
 # include(CPack)
 
-# eof
+# eof

deps_src/minilzo/CMakeLists.txt

@@ -16,7 +16,7 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
 endif()
 
 target_link_libraries(minilzo INTERFACE minilzo_static)
-target_include_directories(minilzo INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(minilzo SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 message(STATUS "Minilzo using bundled version...")
 

deps_src/miniz/CMakeLists.txt

@@ -14,5 +14,5 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
 endif()
 
 target_link_libraries(miniz INTERFACE miniz_static)
-target_include_directories(miniz INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(miniz SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 

deps_src/nanosvg/CMakeLists.txt

@@ -4,11 +4,12 @@ project(nanosvg)
 
 add_library(nanosvg INTERFACE)
 
-target_include_directories(nanosvg INTERFACE
+target_include_directories(nanosvg SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_sources(nanosvg INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/nanosvg.h
     ${CMAKE_CURRENT_SOURCE_DIR}/nanosvgrast.h
-)
+)

deps_src/nlohmann/CMakeLists.txt

@@ -4,8 +4,9 @@ project(nlohmann_json)
 
 add_library(nlohmann_json INTERFACE)
 
-target_include_directories(nlohmann_json INTERFACE
+target_include_directories(nlohmann_json SYSTEM
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_sources(nlohmann_json INTERFACE
@@ -17,4 +18,4 @@ target_sources(nlohmann_json INTERFACE
 )
 
 # Require C++11 for nlohmann/json
-target_compile_features(nlohmann_json INTERFACE cxx_std_11)
+target_compile_features(nlohmann_json INTERFACE cxx_std_11)

deps_src/semver/CMakeLists.txt

@@ -8,7 +8,7 @@ add_library(semver STATIC
 )
 
 # Set include directories for the library
-target_include_directories(semver 
+target_include_directories(semver SYSTEM
     PUBLIC 
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<INSTALL_INTERFACE:include>

deps_src/spline/CMakeLists.txt

@@ -5,7 +5,7 @@ project(spline)
 add_library(spline INTERFACE)
 
 # Set include directories for the interface library
-target_include_directories(spline 
+target_include_directories(spline SYSTEM
     INTERFACE 
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<INSTALL_INTERFACE:include>
@@ -34,4 +34,4 @@ install(EXPORT splineTargets
     FILE splineTargets.cmake
     NAMESPACE spline::
     DESTINATION lib/cmake/spline
-)
+)

deps_src/stb_dxt/CMakeLists.txt

@@ -5,7 +5,7 @@ project(stb_dxt)
 add_library(stb_dxt INTERFACE)
 
 # Set include directories for the interface library
-target_include_directories(stb_dxt 
+target_include_directories(stb_dxt SYSTEM
     INTERFACE 
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<INSTALL_INTERFACE:include>
@@ -34,4 +34,4 @@ install(EXPORT stb_dxtTargets
     FILE stb_dxtTargets.cmake
     NAMESPACE stb_dxt::
     DESTINATION lib/cmake/stb_dxt
-)
+)

src/libslic3r/CMakeLists.txt

@@ -21,30 +21,71 @@ endif()
 option(BUILD_SHARED_LIBS "Build shared libs" OFF)
 
 set(lisbslic3r_sources
-    ArcFitter.cpp
+    AABBMesh.cpp
-    ArcFitter.hpp
+    AABBMesh.hpp
-    pchheader.cpp
-    pchheader.hpp
     AABBTreeIndirect.hpp
     AABBTreeLines.hpp
-    AABBMesh.hpp
-    AABBMesh.cpp
-    Algorithm/LineSplit.hpp
     Algorithm/LineSplit.cpp
-    Algorithm/RegionExpansion.hpp
+    Algorithm/LineSplit.hpp
     Algorithm/RegionExpansion.cpp
+    Algorithm/RegionExpansion.hpp
     AnyPtr.hpp
+    AppConfig.cpp
+    AppConfig.hpp
+    Arachne/BeadingStrategy/BeadingStrategy.cpp
+    Arachne/BeadingStrategy/BeadingStrategyFactory.cpp
+    Arachne/BeadingStrategy/BeadingStrategyFactory.hpp
+    Arachne/BeadingStrategy/BeadingStrategy.hpp
+    Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp
+    Arachne/BeadingStrategy/DistributedBeadingStrategy.hpp
+    Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp
+    Arachne/BeadingStrategy/LimitedBeadingStrategy.hpp
+    Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp
+    Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.hpp
+    Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp
+    Arachne/BeadingStrategy/RedistributeBeadingStrategy.hpp
+    Arachne/BeadingStrategy/WideningBeadingStrategy.cpp
+    Arachne/BeadingStrategy/WideningBeadingStrategy.hpp
+    Arachne/SkeletalTrapezoidation.cpp
+    Arachne/SkeletalTrapezoidationEdge.hpp
+    Arachne/SkeletalTrapezoidationGraph.cpp
+    Arachne/SkeletalTrapezoidationGraph.hpp
+    Arachne/SkeletalTrapezoidation.hpp
+    Arachne/SkeletalTrapezoidationJoint.hpp
+    Arachne/utils/ExtrusionJunction.hpp
+    Arachne/utils/ExtrusionLine.cpp
+    Arachne/utils/ExtrusionLine.hpp
+    Arachne/utils/HalfEdgeGraph.hpp
+    Arachne/utils/HalfEdge.hpp
+    Arachne/utils/HalfEdgeNode.hpp
+    Arachne/utils/PolygonsPointIndex.hpp
+    Arachne/utils/PolygonsSegmentIndex.hpp
+    Arachne/utils/PolylineStitcher.cpp
+    Arachne/utils/PolylineStitcher.hpp
+    Arachne/utils/SparseGrid.hpp
+    Arachne/utils/SparseLineGrid.hpp
+    Arachne/utils/SparsePointGrid.hpp
+    Arachne/utils/SquareGrid.cpp
+    Arachne/utils/SquareGrid.hpp
+    Arachne/WallToolPaths.cpp
+    Arachne/WallToolPaths.hpp
+    ArcFitter.cpp
+    ArcFitter.hpp
+    Arrange.cpp
+    Arrange.hpp
+    BlacklistedLibraryCheck.cpp
+    BlacklistedLibraryCheck.hpp
     BoundingBox.cpp
     BoundingBox.hpp
     BridgeDetector.cpp
     BridgeDetector.hpp
-    FaceDetector.cpp
-    FaceDetector.hpp
     Brim.cpp
-    Brim.hpp
     BrimEarsPoint.hpp
+    Brim.hpp
     BuildVolume.cpp
     BuildVolume.hpp
+    calib.cpp
+    calib.hpp
     Circle.cpp
     Circle.hpp
     clipper.cpp
@@ -56,6 +97,10 @@ set(lisbslic3r_sources
     Color.hpp
     Config.cpp
     Config.hpp
+    CustomGCode.cpp
+    CustomGCode.hpp
+    CutUtils.cpp
+    CutUtils.hpp
     EdgeGrid.cpp
     EdgeGrid.hpp
     ElephantFootCompensation.cpp
@@ -64,6 +109,9 @@ set(lisbslic3r_sources
     Emboss.hpp
     EmbossShape.hpp
     enum_bitmask.hpp
+    Execution/Execution.hpp
+    Execution/ExecutionSeq.hpp
+    Execution/ExecutionTBB.hpp
     ExPolygon.cpp
     ExPolygon.hpp
     ExPolygonSerialize.hpp
@@ -71,21 +119,21 @@ set(lisbslic3r_sources
     ExPolygonsIndex.hpp
     Extruder.cpp
     Extruder.hpp
-    ExtrusionEntity.cpp
-    ExtrusionEntity.hpp
     ExtrusionEntityCollection.cpp
     ExtrusionEntityCollection.hpp
+    ExtrusionEntity.cpp
+    ExtrusionEntity.hpp
     ExtrusionSimulator.cpp
     ExtrusionSimulator.hpp
+    FaceDetector.cpp
+    FaceDetector.hpp
+    Feature/FuzzySkin/FuzzySkin.cpp
+    Feature/FuzzySkin/FuzzySkin.hpp
     Feature/Interlocking/InterlockingGenerator.cpp
     Feature/Interlocking/InterlockingGenerator.hpp
     Feature/Interlocking/VoxelUtils.cpp
     Feature/Interlocking/VoxelUtils.hpp
     FileParserError.hpp
-    Feature/FuzzySkin/FuzzySkin.cpp
-    Feature/FuzzySkin/FuzzySkin.hpp
-    Fill/Fill.cpp
-    Fill/Fill.hpp
     Fill/Fill3DHoneycomb.cpp
     Fill/Fill3DHoneycomb.hpp
     Fill/FillAdaptive.cpp
@@ -96,22 +144,26 @@ set(lisbslic3r_sources
     Fill/FillConcentric.hpp
     Fill/FillConcentricInternal.cpp
     Fill/FillConcentricInternal.hpp
+    Fill/Fill.cpp
     Fill/FillCrossHatch.cpp
     Fill/FillCrossHatch.hpp
-    Fill/FillHoneycomb.cpp
-    Fill/FillHoneycomb.hpp
     Fill/FillGyroid.cpp
     Fill/FillGyroid.hpp
+    Fill/FillHoneycomb.cpp
+    Fill/FillHoneycomb.hpp
+    Fill/Fill.hpp
+    Fill/FillLightning.cpp
+    Fill/FillLightning.hpp
+    Fill/FillLine.cpp
+    Fill/FillLine.hpp
+    Fill/FillPlanePath.cpp
+    Fill/FillPlanePath.hpp
+    Fill/FillRectilinear.cpp
+    Fill/FillRectilinear.hpp
     Fill/FillTpmsD.cpp
     Fill/FillTpmsD.hpp
     Fill/FillTpmsFK.cpp
     Fill/FillTpmsFK.hpp
-    Fill/FillPlanePath.cpp
-    Fill/FillPlanePath.hpp
-    Fill/FillLine.cpp
-    Fill/FillLine.hpp
-    Fill/FillLightning.cpp
-    Fill/FillLightning.hpp
     Fill/Lightning/DistanceField.cpp
     Fill/Lightning/DistanceField.hpp
     Fill/Lightning/Generator.cpp
@@ -120,219 +172,256 @@ set(lisbslic3r_sources
     Fill/Lightning/Layer.hpp
     Fill/Lightning/TreeNode.cpp
     Fill/Lightning/TreeNode.hpp
-    Fill/FillRectilinear.cpp
-    Fill/FillRectilinear.hpp
     Flow.cpp
     Flow.hpp
     FlushVolCalc.cpp
     FlushVolCalc.hpp
-    format.hpp
     Format/3mf.cpp
     Format/3mf.hpp
-    Format/bbs_3mf.cpp
-    Format/bbs_3mf.hpp
     Format/AMF.cpp
     Format/AMF.hpp
+    Format/bbs_3mf.cpp
+    Format/bbs_3mf.hpp
+    format.hpp
     Format/OBJ.cpp
     Format/OBJ.hpp
     Format/objparser.cpp
     Format/objparser.hpp
+    Format/SL1.cpp
+    Format/SL1.hpp
     Format/STEP.cpp
     Format/STEP.hpp
     Format/STL.cpp
     Format/STL.hpp
-    Format/SL1.hpp
-    Format/SL1.cpp
-	Format/svg.hpp
     Format/svg.cpp
-    Format/ZipperArchiveImport.hpp
+    Format/svg.hpp
     Format/ZipperArchiveImport.cpp
-    GCode/ThumbnailData.cpp
+    Format/ZipperArchiveImport.hpp
-    GCode/ThumbnailData.hpp
+    GCode/AdaptivePAInterpolator.cpp
+    GCode/AdaptivePAInterpolator.hpp
+    GCode/AdaptivePAProcessor.cpp
+    GCode/AdaptivePAProcessor.hpp
+    GCode/AvoidCrossingPerimeters.cpp
+    GCode/AvoidCrossingPerimeters.hpp
+    GCode/ConflictChecker.cpp
+    GCode/ConflictChecker.hpp
     GCode/CoolingBuffer.cpp
     GCode/CoolingBuffer.hpp
-	GCode/FanMover.cpp
+    GCode.cpp
+    GCode/ExtrusionProcessor.hpp
+    GCode/FanMover.cpp
     GCode/FanMover.hpp
+    GCode/GCodeProcessor.cpp
+    GCode/GCodeProcessor.hpp
+    GCode.hpp
+    GCode/PchipInterpolatorHelper.cpp
+    GCode/PchipInterpolatorHelper.hpp
     GCode/PostProcessor.cpp
     GCode/PostProcessor.hpp
     GCode/PressureEqualizer.cpp
     GCode/PressureEqualizer.hpp
     GCode/PrintExtents.cpp
     GCode/PrintExtents.hpp
-    GCode/RetractWhenCrossingPerimeters.cpp
-    GCode/RetractWhenCrossingPerimeters.hpp
-    GCode/SmallAreaInfillFlowCompensator.cpp
-    GCode/SmallAreaInfillFlowCompensator.hpp
-    GCode/PchipInterpolatorHelper.cpp
-    GCode/PchipInterpolatorHelper.hpp
-    GCode/AdaptivePAInterpolator.cpp
-    GCode/AdaptivePAInterpolator.hpp
-    GCode/AdaptivePAProcessor.cpp
-    GCode/AdaptivePAProcessor.hpp
-    GCode/SpiralVase.cpp
-    GCode/SpiralVase.hpp
-    GCode/SeamPlacer.cpp
-    GCode/SeamPlacer.hpp
-    GCode/ToolOrdering.cpp
-    GCode/ToolOrdering.hpp
-    GCode/WipeTower.cpp
-    GCode/WipeTower.hpp
-    GCode/WipeTower2.cpp
-    GCode/WipeTower2.hpp
-    GCode/GCodeProcessor.cpp
-    GCode/GCodeProcessor.hpp
-    GCode/AvoidCrossingPerimeters.cpp
-    GCode/AvoidCrossingPerimeters.hpp
-    GCode/ExtrusionProcessor.hpp
-    GCode/ConflictChecker.cpp
-    GCode/ConflictChecker.hpp
-    GCode.cpp
-    GCode.hpp
     GCodeReader.cpp
     GCodeReader.hpp
-    # GCodeSender.cpp
+    GCode/RetractWhenCrossingPerimeters.cpp
-    # GCodeSender.hpp
+    GCode/RetractWhenCrossingPerimeters.hpp
+    GCode/SeamPlacer.cpp
+    GCode/SeamPlacer.hpp
+    #GCodeSender.cpp
+    #GCodeSender.hpp
+    GCode/SmallAreaInfillFlowCompensator.cpp
+    GCode/SmallAreaInfillFlowCompensator.hpp
+    GCode/SpiralVase.cpp
+    GCode/SpiralVase.hpp
+    GCode/ThumbnailData.cpp
+    GCode/ThumbnailData.hpp
+    GCode/Thumbnails.cpp
+    GCode/Thumbnails.hpp
+    GCode/ToolOrdering.cpp
+    GCode/ToolOrdering.hpp
+    GCode/WipeTower2.cpp
+    GCode/WipeTower2.hpp
+    GCode/WipeTower.cpp
+    GCode/WipeTower.hpp
     GCodeWriter.cpp
     GCodeWriter.hpp
-    Geometry.cpp
-    Geometry.hpp
     Geometry/Bicubic.hpp
     Geometry/Circle.cpp
     Geometry/Circle.hpp
     Geometry/ConvexHull.cpp
     Geometry/ConvexHull.hpp
+    Geometry.cpp
     Geometry/Curves.hpp
+    Geometry.hpp
     Geometry/MedialAxis.cpp
     Geometry/MedialAxis.hpp
-	Geometry/Voronoi.cpp
+    Geometry/Voronoi.cpp
     Geometry/Voronoi.hpp
     Geometry/VoronoiOffset.cpp
     Geometry/VoronoiOffset.hpp
-	Geometry/VoronoiUtils.hpp
-    Geometry/VoronoiUtils.cpp
     Geometry/VoronoiUtilsCgal.cpp
     Geometry/VoronoiUtilsCgal.hpp
+    Geometry/VoronoiUtils.cpp
+    Geometry/VoronoiUtils.hpp
     Geometry/VoronoiVisualUtils.hpp
     Int128.hpp
     KDTreeIndirect.hpp
     Layer.cpp
     Layer.hpp
     LayerRegion.cpp
-    libslic3r.h
     libslic3r.cpp
+    libslic3r.h
     Line.cpp
     Line.hpp
-    BlacklistedLibraryCheck.cpp
-    BlacklistedLibraryCheck.hpp
     LocalesUtils.cpp
     LocalesUtils.hpp
-    CutUtils.cpp
+    MarchingSquares.hpp
-    CutUtils.hpp
+    Measure.cpp
+    Measure.hpp
+    MeasureUtils.hpp
+    MeshSplitImpl.hpp
+    MinAreaBoundingBox.cpp
+    MinAreaBoundingBox.hpp
+    MinimumSpanningTree.cpp
+    MinimumSpanningTree.hpp
+    miniz_extension.cpp
+    miniz_extension.hpp
+    ModelArrange.cpp
+    ModelArrange.hpp
     Model.cpp
     Model.hpp
-    ModelArrange.hpp
+    MTUtils.hpp
-    ModelArrange.cpp
     MultiMaterialSegmentation.cpp
     MultiMaterialSegmentation.hpp
-    Measure.hpp
-    Measure.cpp
-    MeasureUtils.hpp
-    CustomGCode.cpp
-    CustomGCode.hpp
-    Arrange.hpp
-    Arrange.cpp
-    NormalUtils.cpp
-    NormalUtils.hpp
-    ObjColorUtils.hpp
-    Orient.hpp
-    Orient.cpp
     MultiPoint.cpp
     MultiPoint.hpp
+    MutablePolygon.cpp
+    MutablePolygon.hpp
     MutablePriorityQueue.hpp
+    NormalUtils.cpp
+    NormalUtils.hpp
     NSVGUtils.cpp
     NSVGUtils.hpp
+    ObjColorUtils.hpp
     ObjectID.cpp
     ObjectID.hpp
-	ParameterUtils.cpp
+    Optimize/BruteforceOptimizer.hpp
+    Optimize/NLoptOptimizer.hpp
+    Optimize/Optimizer.hpp
+    Orient.cpp
+    Orient.hpp
+    ParameterUtils.cpp
     ParameterUtils.hpp
+    pchheader.cpp
+    pchheader.hpp
     PerimeterGenerator.cpp
     PerimeterGenerator.hpp
     PlaceholderParser.cpp
     PlaceholderParser.hpp
     Platform.cpp
     Platform.hpp
+    PNGReadWrite.cpp
+    PNGReadWrite.hpp
     Point.cpp
     Point.hpp
     Polygon.cpp
     Polygon.hpp
-    MutablePolygon.cpp
-    MutablePolygon.hpp
     PolygonTrimmer.cpp
     PolygonTrimmer.hpp
     Polyline.cpp
     Polyline.hpp
-    Preset.cpp
-    Preset.hpp
     PresetBundle.cpp
     PresetBundle.hpp
-    ProjectTask.cpp
+    Preset.cpp
-    ProjectTask.hpp
+    Preset.hpp
-    PrincipalComponents2D.hpp
     PrincipalComponents2D.cpp
-    AppConfig.cpp
+    PrincipalComponents2D.hpp
-    AppConfig.hpp
-    Print.cpp
-    Print.hpp
     PrintApply.cpp
     PrintBase.cpp
     PrintBase.hpp
     PrintConfig.cpp
     PrintConfig.hpp
+    Print.cpp
+    Print.hpp
     PrintObject.cpp
     PrintObjectSlice.cpp
     PrintRegion.cpp
-    PNGReadWrite.hpp
+    ProjectTask.cpp
-    PNGReadWrite.cpp
+    ProjectTask.hpp
     QuadricEdgeCollapse.cpp
     QuadricEdgeCollapse.hpp
     Semver.cpp
+    Shape/TextShape.cpp
+    Shape/TextShape.hpp
     ShortEdgeCollapse.cpp
     ShortEdgeCollapse.hpp
     ShortestPath.cpp
     ShortestPath.hpp
+    SLA/AGGRaster.hpp
+    SLA/BoostAdapter.hpp
+    SLA/Clustering.cpp
+    SLA/Clustering.hpp
+    SLA/ConcaveHull.cpp
+    SLA/ConcaveHull.hpp
+    SLA/Concurrency.hpp
+    SLA/Hollowing.cpp
+    SLA/Hollowing.hpp
+    SLA/IndexedMesh.cpp
+    SLA/IndexedMesh.hpp
+    SLA/JobController.hpp
+    SLA/Pad.cpp
+    SLA/Pad.hpp
     SLAPrint.cpp
+    SLAPrint.hpp
     SLAPrintSteps.cpp
     SLAPrintSteps.hpp
-    SLAPrint.hpp
+    SLA/RasterBase.cpp
-    Slicing.cpp
+    SLA/RasterBase.hpp
-    Slicing.hpp
+    SLA/RasterToPolygons.cpp
-    SlicesToTriangleMesh.hpp
+    SLA/RasterToPolygons.hpp
+    SLA/ReprojectPointsOnMesh.hpp
+    SLA/Rotfinder.cpp
+    SLA/Rotfinder.hpp
+    SLA/SpatIndex.cpp
+    SLA/SpatIndex.hpp
+    SLA/SupportPointGenerator.cpp
+    SLA/SupportPointGenerator.hpp
+    SLA/SupportPoint.hpp
+    SLA/SupportTreeBuilder.cpp
+    SLA/SupportTreeBuilder.hpp
+    SLA/SupportTreeBuildsteps.cpp
+    SLA/SupportTreeBuildsteps.hpp
+    SLA/SupportTree.cpp
+    SLA/SupportTree.hpp
+    #SLA/SupportTreeIGL.cpp
+    SLA/SupportTreeMesher.cpp
+    SLA/SupportTreeMesher.hpp
     SlicesToTriangleMesh.cpp
+    SlicesToTriangleMesh.hpp
     SlicingAdaptive.cpp
     SlicingAdaptive.hpp
+    Slicing.cpp
+    Slicing.hpp
     Support/SupportCommon.cpp
     Support/SupportCommon.hpp
     Support/SupportLayer.hpp
     Support/SupportMaterial.cpp
     Support/SupportMaterial.hpp
+    Support/SupportParameters.hpp
     Support/SupportSpotsGenerator.cpp
     Support/SupportSpotsGenerator.hpp
-    Support/TreeSupport.hpp
-    Support/TreeSupport.cpp
-    Support/TreeSupport3D.hpp
-    Support/TreeSupport3D.cpp
-    Support/TreeModelVolumes.hpp
     Support/TreeModelVolumes.cpp
+    Support/TreeModelVolumes.hpp
+    Support/TreeSupport3D.cpp
+    Support/TreeSupport3D.hpp
     Support/TreeSupportCommon.hpp
-    Support/SupportParameters.hpp
+    Support/TreeSupport.cpp
-    PrincipalComponents2D.cpp
+    Support/TreeSupport.hpp
-    PrincipalComponents2D.hpp
-    MinimumSpanningTree.hpp
-    MinimumSpanningTree.cpp
-    Surface.cpp
-    Surface.hpp
     SurfaceCollection.cpp
     SurfaceCollection.hpp
+    Surface.cpp
+    Surface.hpp
     SurfaceMesh.hpp
     SVG.cpp
     SVG.hpp
@@ -340,124 +429,33 @@ set(lisbslic3r_sources
     Tesselate.cpp
     Tesselate.hpp
     TextConfiguration.hpp
-    TriangleMesh.cpp
+    Thread.cpp
-    TriangleMesh.hpp
+    Thread.hpp
-    TriangleMeshSlicer.cpp
-    TriangleMeshSlicer.hpp
-    MeshSplitImpl.hpp
-    TriangulateWall.hpp
-    TriangulateWall.cpp
-    utils.cpp
-    Utils.hpp
     Time.cpp
     Time.hpp
     Timer.cpp
     Timer.hpp
-    Thread.cpp
+    TriangleMesh.cpp
-    Thread.hpp
+    TriangleMesh.hpp
+    TriangleMeshSlicer.cpp
+    TriangleMeshSlicer.hpp
     TriangleSelector.cpp
     TriangleSelector.hpp
     TriangleSetSampling.cpp
     TriangleSetSampling.hpp
-    MTUtils.hpp
+    TriangulateWall.cpp
+    TriangulateWall.hpp
+    utils.cpp
+    Utils.hpp
     VariableWidth.cpp
     VariableWidth.hpp
-    Zipper.hpp
     Zipper.cpp
-    MinAreaBoundingBox.hpp
+    Zipper.hpp
-    MinAreaBoundingBox.cpp
-    miniz_extension.hpp
-    miniz_extension.cpp
-    MarchingSquares.hpp
-    Execution/Execution.hpp
-    Execution/ExecutionSeq.hpp
-    Execution/ExecutionTBB.hpp
-    Optimize/Optimizer.hpp
-    Optimize/NLoptOptimizer.hpp
-    Optimize/BruteforceOptimizer.hpp
-    SLA/Pad.hpp
-    SLA/Pad.cpp
-    SLA/SupportTreeBuilder.hpp
-    SLA/SupportTreeMesher.hpp
-    SLA/SupportTreeMesher.cpp
-    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/SpatIndex.cpp
-    SLA/RasterBase.hpp
-    SLA/RasterBase.cpp
-    SLA/AGGRaster.hpp
-    SLA/RasterToPolygons.hpp
-    SLA/RasterToPolygons.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/IndexedMesh.hpp
-    SLA/IndexedMesh.cpp
-    SLA/Clustering.hpp
-    SLA/Clustering.cpp
-    SLA/ReprojectPointsOnMesh.hpp
-    Arachne/BeadingStrategy/BeadingStrategy.hpp
-    Arachne/BeadingStrategy/BeadingStrategy.cpp
-    Arachne/BeadingStrategy/BeadingStrategyFactory.hpp
-    Arachne/BeadingStrategy/BeadingStrategyFactory.cpp
-    Arachne/BeadingStrategy/DistributedBeadingStrategy.hpp
-    Arachne/BeadingStrategy/DistributedBeadingStrategy.cpp
-    Arachne/BeadingStrategy/LimitedBeadingStrategy.hpp
-    Arachne/BeadingStrategy/LimitedBeadingStrategy.cpp
-    Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.hpp
-    Arachne/BeadingStrategy/OuterWallInsetBeadingStrategy.cpp
-    Arachne/BeadingStrategy/RedistributeBeadingStrategy.hpp
-    Arachne/BeadingStrategy/RedistributeBeadingStrategy.cpp
-    Arachne/BeadingStrategy/WideningBeadingStrategy.hpp
-    Arachne/BeadingStrategy/WideningBeadingStrategy.cpp
-    Arachne/utils/ExtrusionJunction.hpp
-    Arachne/utils/ExtrusionLine.hpp
-    Arachne/utils/ExtrusionLine.cpp
-    Arachne/utils/HalfEdge.hpp
-    Arachne/utils/HalfEdgeGraph.hpp
-    Arachne/utils/HalfEdgeNode.hpp
-    Arachne/utils/SparseGrid.hpp
-    Arachne/utils/SparsePointGrid.hpp
-    Arachne/utils/SparseLineGrid.hpp
-    Arachne/utils/SquareGrid.hpp
-    Arachne/utils/SquareGrid.cpp
-    Arachne/utils/PolygonsPointIndex.hpp
-    Arachne/utils/PolygonsSegmentIndex.hpp
-    Arachne/utils/PolylineStitcher.hpp
-    Arachne/utils/PolylineStitcher.cpp
-    Arachne/SkeletalTrapezoidation.hpp
-    Arachne/SkeletalTrapezoidation.cpp
-    Arachne/SkeletalTrapezoidationEdge.hpp
-    Arachne/SkeletalTrapezoidationGraph.hpp
-    Arachne/SkeletalTrapezoidationGraph.cpp
-    Arachne/SkeletalTrapezoidationJoint.hpp
-    Arachne/WallToolPaths.hpp
-    Arachne/WallToolPaths.cpp
-    Shape/TextShape.hpp
-    Shape/TextShape.cpp
-    calib.hpp
-    calib.cpp
-    GCode/Thumbnails.cpp
-    GCode/Thumbnails.hpp
 )
 
 if (APPLE)
     list(APPEND lisbslic3r_sources
-			MacUtils.mm
+            MacUtils.mm
             Format/ModelIO.hpp
             Format/ModelIO.mm
         )
@@ -519,7 +517,7 @@ target_include_directories(libslic3r SYSTEM PUBLIC ${EXPAT_INCLUDE_DIRS})
 # Find the OCCT and related libraries
 set(OpenCASCADE_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/occt")
 find_package(OpenCASCADE REQUIRED)
-target_include_directories(libslic3r PUBLIC ${OpenCASCADE_INCLUDE_DIR})
+target_include_directories(libslic3r SYSTEM PUBLIC ${OpenCASCADE_INCLUDE_DIR})
 
 find_package(JPEG REQUIRED)
 

src/slic3r/GUI/Widgets/ScrolledWindow.cpp

@@ -1,5 +1,4 @@
 // for scroll
-#pragma once
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
 #include <wx/wx.h>