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
This commit is contained in:
Dipl.-Ing. Raoul Rubien, BSc
2025-09-19 17:45:03 +02:00
committed by GitHub
parent 94cc5465f1
commit 75ed995b00
28 changed files with 824 additions and 816 deletions

2
.gitignore vendored
View File

@@ -1,6 +1,8 @@
Build Build
Build.bat Build.bat
/build*/ /build*/
CMakeLists.txt.user
**/CMakeLists.txt.autosave
deps/build* deps/build*
MYMETA.json MYMETA.json
MYMETA.yml MYMETA.yml

View File

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

View File

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

View File

@@ -3,7 +3,8 @@ project(agg)
add_library(agg INTERFACE) add_library(agg INTERFACE)
target_include_directories(agg INTERFACE target_include_directories(agg SYSTEM
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )

View File

@@ -3,7 +3,8 @@ project(ankerl)
add_library(ankerl INTERFACE) add_library(ankerl INTERFACE)
target_include_directories(ankerl INTERFACE target_include_directories(ankerl SYSTEM
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )

View File

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

View File

@@ -3,7 +3,8 @@ project(eigen)
add_library(eigen INTERFACE) add_library(eigen INTERFACE)
target_include_directories(eigen INTERFACE target_include_directories(eigen SYSTEM
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )

View File

@@ -7,7 +7,8 @@ add_library(expat STATIC
xmltok.c xmltok.c
) )
target_include_directories(expat PUBLIC target_include_directories(expat SYSTEM
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )

View File

@@ -3,7 +3,8 @@ project(fast_float)
add_library(fast_float INTERFACE) add_library(fast_float INTERFACE)
target_include_directories(fast_float INTERFACE target_include_directories(fast_float SYSTEM
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )

View File

@@ -34,4 +34,8 @@ if(UNIX)
target_link_libraries(glu-libtess m) target_link_libraries(glu-libtess m)
endif(UNIX) 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)

View File

@@ -11,7 +11,12 @@ endif()
include_directories(include) include_directories(include)
add_library(hidapi STATIC ${HIDAPI_IMPL}) 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") 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. # Don't link the udev library, as there are two versions out there (libudev.so.0, libudev.so.1), so they are linked explicitely.

View File

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

View File

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

View File

@@ -7,9 +7,11 @@ add_library(imguizmo STATIC
ImGuizmo.cpp 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) target_link_libraries(imguizmo PUBLIC imgui)

View File

@@ -11,5 +11,7 @@ if(libigl_FOUND)
target_link_libraries(libigl INTERFACE igl::core) target_link_libraries(libigl INTERFACE igl::core)
else() else()
message(STATUS "IGL NOT found, using bundled version...") 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() endif()

View File

@@ -23,6 +23,6 @@ set(LIBNEST2D_SRCFILES
add_library(libnest2d STATIC ${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_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) target_compile_definitions(libnest2d PUBLIC LIBNEST2D_THREADING_tbb LIBNEST2D_STATIC LIBNEST2D_OPTIMIZER_nlopt LIBNEST2D_GEOMETRIES_libslic3r)

View File

@@ -176,7 +176,7 @@ function(create_library_target LIBRARY_TYPE)
add_library(${target_name} ${LIBRARY_TYPE} ${project_source_files}) 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_link_libraries(${target_name} PRIVATE ${extra_libs})
target_compile_options(${target_name} PRIVATE ${compilation_flags}) target_compile_options(${target_name} PRIVATE ${compilation_flags})
target_compile_definitions(${target_name} PRIVATE ${preprocessor_defs} ) target_compile_definitions(${target_name} PRIVATE ${preprocessor_defs} )

View File

@@ -16,7 +16,7 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
endif() endif()
target_link_libraries(minilzo INTERFACE minilzo_static) 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...") message(STATUS "Minilzo using bundled version...")

View File

@@ -14,5 +14,5 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
endif() endif()
target_link_libraries(miniz INTERFACE miniz_static) 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})

View File

@@ -4,7 +4,8 @@ project(nanosvg)
add_library(nanosvg INTERFACE) add_library(nanosvg INTERFACE)
target_include_directories(nanosvg INTERFACE target_include_directories(nanosvg SYSTEM
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )

View File

@@ -4,7 +4,8 @@ project(nlohmann_json)
add_library(nlohmann_json INTERFACE) add_library(nlohmann_json INTERFACE)
target_include_directories(nlohmann_json INTERFACE target_include_directories(nlohmann_json SYSTEM
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )

View File

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

View File

@@ -5,7 +5,7 @@ project(spline)
add_library(spline INTERFACE) add_library(spline INTERFACE)
# Set include directories for the interface library # Set include directories for the interface library
target_include_directories(spline target_include_directories(spline SYSTEM
INTERFACE INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>

View File

@@ -5,7 +5,7 @@ project(stb_dxt)
add_library(stb_dxt INTERFACE) add_library(stb_dxt INTERFACE)
# Set include directories for the interface library # Set include directories for the interface library
target_include_directories(stb_dxt target_include_directories(stb_dxt SYSTEM
INTERFACE INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>

View File

@@ -21,30 +21,71 @@ endif()
option(BUILD_SHARED_LIBS "Build shared libs" OFF) option(BUILD_SHARED_LIBS "Build shared libs" OFF)
set(lisbslic3r_sources set(lisbslic3r_sources
ArcFitter.cpp AABBMesh.cpp
ArcFitter.hpp AABBMesh.hpp
pchheader.cpp
pchheader.hpp
AABBTreeIndirect.hpp AABBTreeIndirect.hpp
AABBTreeLines.hpp AABBTreeLines.hpp
AABBMesh.hpp
AABBMesh.cpp
Algorithm/LineSplit.hpp
Algorithm/LineSplit.cpp Algorithm/LineSplit.cpp
Algorithm/RegionExpansion.hpp Algorithm/LineSplit.hpp
Algorithm/RegionExpansion.cpp Algorithm/RegionExpansion.cpp
Algorithm/RegionExpansion.hpp
AnyPtr.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.cpp
BoundingBox.hpp BoundingBox.hpp
BridgeDetector.cpp BridgeDetector.cpp
BridgeDetector.hpp BridgeDetector.hpp
FaceDetector.cpp
FaceDetector.hpp
Brim.cpp Brim.cpp
Brim.hpp
BrimEarsPoint.hpp BrimEarsPoint.hpp
Brim.hpp
BuildVolume.cpp BuildVolume.cpp
BuildVolume.hpp BuildVolume.hpp
calib.cpp
calib.hpp
Circle.cpp Circle.cpp
Circle.hpp Circle.hpp
clipper.cpp clipper.cpp
@@ -56,6 +97,10 @@ set(lisbslic3r_sources
Color.hpp Color.hpp
Config.cpp Config.cpp
Config.hpp Config.hpp
CustomGCode.cpp
CustomGCode.hpp
CutUtils.cpp
CutUtils.hpp
EdgeGrid.cpp EdgeGrid.cpp
EdgeGrid.hpp EdgeGrid.hpp
ElephantFootCompensation.cpp ElephantFootCompensation.cpp
@@ -64,6 +109,9 @@ set(lisbslic3r_sources
Emboss.hpp Emboss.hpp
EmbossShape.hpp EmbossShape.hpp
enum_bitmask.hpp enum_bitmask.hpp
Execution/Execution.hpp
Execution/ExecutionSeq.hpp
Execution/ExecutionTBB.hpp
ExPolygon.cpp ExPolygon.cpp
ExPolygon.hpp ExPolygon.hpp
ExPolygonSerialize.hpp ExPolygonSerialize.hpp
@@ -71,21 +119,21 @@ set(lisbslic3r_sources
ExPolygonsIndex.hpp ExPolygonsIndex.hpp
Extruder.cpp Extruder.cpp
Extruder.hpp Extruder.hpp
ExtrusionEntity.cpp
ExtrusionEntity.hpp
ExtrusionEntityCollection.cpp ExtrusionEntityCollection.cpp
ExtrusionEntityCollection.hpp ExtrusionEntityCollection.hpp
ExtrusionEntity.cpp
ExtrusionEntity.hpp
ExtrusionSimulator.cpp ExtrusionSimulator.cpp
ExtrusionSimulator.hpp ExtrusionSimulator.hpp
FaceDetector.cpp
FaceDetector.hpp
Feature/FuzzySkin/FuzzySkin.cpp
Feature/FuzzySkin/FuzzySkin.hpp
Feature/Interlocking/InterlockingGenerator.cpp Feature/Interlocking/InterlockingGenerator.cpp
Feature/Interlocking/InterlockingGenerator.hpp Feature/Interlocking/InterlockingGenerator.hpp
Feature/Interlocking/VoxelUtils.cpp Feature/Interlocking/VoxelUtils.cpp
Feature/Interlocking/VoxelUtils.hpp Feature/Interlocking/VoxelUtils.hpp
FileParserError.hpp FileParserError.hpp
Feature/FuzzySkin/FuzzySkin.cpp
Feature/FuzzySkin/FuzzySkin.hpp
Fill/Fill.cpp
Fill/Fill.hpp
Fill/Fill3DHoneycomb.cpp Fill/Fill3DHoneycomb.cpp
Fill/Fill3DHoneycomb.hpp Fill/Fill3DHoneycomb.hpp
Fill/FillAdaptive.cpp Fill/FillAdaptive.cpp
@@ -96,22 +144,26 @@ set(lisbslic3r_sources
Fill/FillConcentric.hpp Fill/FillConcentric.hpp
Fill/FillConcentricInternal.cpp Fill/FillConcentricInternal.cpp
Fill/FillConcentricInternal.hpp Fill/FillConcentricInternal.hpp
Fill/Fill.cpp
Fill/FillCrossHatch.cpp Fill/FillCrossHatch.cpp
Fill/FillCrossHatch.hpp Fill/FillCrossHatch.hpp
Fill/FillHoneycomb.cpp
Fill/FillHoneycomb.hpp
Fill/FillGyroid.cpp Fill/FillGyroid.cpp
Fill/FillGyroid.hpp 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.cpp
Fill/FillTpmsD.hpp Fill/FillTpmsD.hpp
Fill/FillTpmsFK.cpp Fill/FillTpmsFK.cpp
Fill/FillTpmsFK.hpp 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.cpp
Fill/Lightning/DistanceField.hpp Fill/Lightning/DistanceField.hpp
Fill/Lightning/Generator.cpp Fill/Lightning/Generator.cpp
@@ -120,219 +172,256 @@ set(lisbslic3r_sources
Fill/Lightning/Layer.hpp Fill/Lightning/Layer.hpp
Fill/Lightning/TreeNode.cpp Fill/Lightning/TreeNode.cpp
Fill/Lightning/TreeNode.hpp Fill/Lightning/TreeNode.hpp
Fill/FillRectilinear.cpp
Fill/FillRectilinear.hpp
Flow.cpp Flow.cpp
Flow.hpp Flow.hpp
FlushVolCalc.cpp FlushVolCalc.cpp
FlushVolCalc.hpp FlushVolCalc.hpp
format.hpp
Format/3mf.cpp Format/3mf.cpp
Format/3mf.hpp Format/3mf.hpp
Format/bbs_3mf.cpp
Format/bbs_3mf.hpp
Format/AMF.cpp Format/AMF.cpp
Format/AMF.hpp Format/AMF.hpp
Format/bbs_3mf.cpp
Format/bbs_3mf.hpp
format.hpp
Format/OBJ.cpp Format/OBJ.cpp
Format/OBJ.hpp Format/OBJ.hpp
Format/objparser.cpp Format/objparser.cpp
Format/objparser.hpp Format/objparser.hpp
Format/SL1.cpp
Format/SL1.hpp
Format/STEP.cpp Format/STEP.cpp
Format/STEP.hpp Format/STEP.hpp
Format/STL.cpp Format/STL.cpp
Format/STL.hpp Format/STL.hpp
Format/SL1.hpp
Format/SL1.cpp
Format/svg.hpp
Format/svg.cpp Format/svg.cpp
Format/ZipperArchiveImport.hpp Format/svg.hpp
Format/ZipperArchiveImport.cpp 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.cpp
GCode/CoolingBuffer.hpp GCode/CoolingBuffer.hpp
GCode.cpp
GCode/ExtrusionProcessor.hpp
GCode/FanMover.cpp GCode/FanMover.cpp
GCode/FanMover.hpp GCode/FanMover.hpp
GCode/GCodeProcessor.cpp
GCode/GCodeProcessor.hpp
GCode.hpp
GCode/PchipInterpolatorHelper.cpp
GCode/PchipInterpolatorHelper.hpp
GCode/PostProcessor.cpp GCode/PostProcessor.cpp
GCode/PostProcessor.hpp GCode/PostProcessor.hpp
GCode/PressureEqualizer.cpp GCode/PressureEqualizer.cpp
GCode/PressureEqualizer.hpp GCode/PressureEqualizer.hpp
GCode/PrintExtents.cpp GCode/PrintExtents.cpp
GCode/PrintExtents.hpp 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.cpp
GCodeReader.hpp 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.cpp
GCodeWriter.hpp GCodeWriter.hpp
Geometry.cpp
Geometry.hpp
Geometry/Bicubic.hpp Geometry/Bicubic.hpp
Geometry/Circle.cpp Geometry/Circle.cpp
Geometry/Circle.hpp Geometry/Circle.hpp
Geometry/ConvexHull.cpp Geometry/ConvexHull.cpp
Geometry/ConvexHull.hpp Geometry/ConvexHull.hpp
Geometry.cpp
Geometry/Curves.hpp Geometry/Curves.hpp
Geometry.hpp
Geometry/MedialAxis.cpp Geometry/MedialAxis.cpp
Geometry/MedialAxis.hpp Geometry/MedialAxis.hpp
Geometry/Voronoi.cpp Geometry/Voronoi.cpp
Geometry/Voronoi.hpp Geometry/Voronoi.hpp
Geometry/VoronoiOffset.cpp Geometry/VoronoiOffset.cpp
Geometry/VoronoiOffset.hpp Geometry/VoronoiOffset.hpp
Geometry/VoronoiUtils.hpp
Geometry/VoronoiUtils.cpp
Geometry/VoronoiUtilsCgal.cpp Geometry/VoronoiUtilsCgal.cpp
Geometry/VoronoiUtilsCgal.hpp Geometry/VoronoiUtilsCgal.hpp
Geometry/VoronoiUtils.cpp
Geometry/VoronoiUtils.hpp
Geometry/VoronoiVisualUtils.hpp Geometry/VoronoiVisualUtils.hpp
Int128.hpp Int128.hpp
KDTreeIndirect.hpp KDTreeIndirect.hpp
Layer.cpp Layer.cpp
Layer.hpp Layer.hpp
LayerRegion.cpp LayerRegion.cpp
libslic3r.h
libslic3r.cpp libslic3r.cpp
libslic3r.h
Line.cpp Line.cpp
Line.hpp Line.hpp
BlacklistedLibraryCheck.cpp
BlacklistedLibraryCheck.hpp
LocalesUtils.cpp LocalesUtils.cpp
LocalesUtils.hpp 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.cpp
Model.hpp Model.hpp
ModelArrange.hpp MTUtils.hpp
ModelArrange.cpp
MultiMaterialSegmentation.cpp MultiMaterialSegmentation.cpp
MultiMaterialSegmentation.hpp 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.cpp
MultiPoint.hpp MultiPoint.hpp
MutablePolygon.cpp
MutablePolygon.hpp
MutablePriorityQueue.hpp MutablePriorityQueue.hpp
NormalUtils.cpp
NormalUtils.hpp
NSVGUtils.cpp NSVGUtils.cpp
NSVGUtils.hpp NSVGUtils.hpp
ObjColorUtils.hpp
ObjectID.cpp ObjectID.cpp
ObjectID.hpp ObjectID.hpp
Optimize/BruteforceOptimizer.hpp
Optimize/NLoptOptimizer.hpp
Optimize/Optimizer.hpp
Orient.cpp
Orient.hpp
ParameterUtils.cpp ParameterUtils.cpp
ParameterUtils.hpp ParameterUtils.hpp
pchheader.cpp
pchheader.hpp
PerimeterGenerator.cpp PerimeterGenerator.cpp
PerimeterGenerator.hpp PerimeterGenerator.hpp
PlaceholderParser.cpp PlaceholderParser.cpp
PlaceholderParser.hpp PlaceholderParser.hpp
Platform.cpp Platform.cpp
Platform.hpp Platform.hpp
PNGReadWrite.cpp
PNGReadWrite.hpp
Point.cpp Point.cpp
Point.hpp Point.hpp
Polygon.cpp Polygon.cpp
Polygon.hpp Polygon.hpp
MutablePolygon.cpp
MutablePolygon.hpp
PolygonTrimmer.cpp PolygonTrimmer.cpp
PolygonTrimmer.hpp PolygonTrimmer.hpp
Polyline.cpp Polyline.cpp
Polyline.hpp Polyline.hpp
Preset.cpp
Preset.hpp
PresetBundle.cpp PresetBundle.cpp
PresetBundle.hpp PresetBundle.hpp
ProjectTask.cpp Preset.cpp
ProjectTask.hpp Preset.hpp
PrincipalComponents2D.hpp
PrincipalComponents2D.cpp PrincipalComponents2D.cpp
AppConfig.cpp PrincipalComponents2D.hpp
AppConfig.hpp
Print.cpp
Print.hpp
PrintApply.cpp PrintApply.cpp
PrintBase.cpp PrintBase.cpp
PrintBase.hpp PrintBase.hpp
PrintConfig.cpp PrintConfig.cpp
PrintConfig.hpp PrintConfig.hpp
Print.cpp
Print.hpp
PrintObject.cpp PrintObject.cpp
PrintObjectSlice.cpp PrintObjectSlice.cpp
PrintRegion.cpp PrintRegion.cpp
PNGReadWrite.hpp ProjectTask.cpp
PNGReadWrite.cpp ProjectTask.hpp
QuadricEdgeCollapse.cpp QuadricEdgeCollapse.cpp
QuadricEdgeCollapse.hpp QuadricEdgeCollapse.hpp
Semver.cpp Semver.cpp
Shape/TextShape.cpp
Shape/TextShape.hpp
ShortEdgeCollapse.cpp ShortEdgeCollapse.cpp
ShortEdgeCollapse.hpp ShortEdgeCollapse.hpp
ShortestPath.cpp ShortestPath.cpp
ShortestPath.hpp 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.cpp
SLAPrint.hpp
SLAPrintSteps.cpp SLAPrintSteps.cpp
SLAPrintSteps.hpp 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.cpp
SlicesToTriangleMesh.hpp
SlicingAdaptive.cpp SlicingAdaptive.cpp
SlicingAdaptive.hpp SlicingAdaptive.hpp
Slicing.cpp
Slicing.hpp
Support/SupportCommon.cpp Support/SupportCommon.cpp
Support/SupportCommon.hpp Support/SupportCommon.hpp
Support/SupportLayer.hpp Support/SupportLayer.hpp
Support/SupportMaterial.cpp Support/SupportMaterial.cpp
Support/SupportMaterial.hpp Support/SupportMaterial.hpp
Support/SupportParameters.hpp
Support/SupportSpotsGenerator.cpp Support/SupportSpotsGenerator.cpp
Support/SupportSpotsGenerator.hpp Support/SupportSpotsGenerator.hpp
Support/TreeSupport.hpp
Support/TreeSupport.cpp
Support/TreeSupport3D.hpp
Support/TreeSupport3D.cpp
Support/TreeModelVolumes.hpp
Support/TreeModelVolumes.cpp Support/TreeModelVolumes.cpp
Support/TreeModelVolumes.hpp
Support/TreeSupport3D.cpp
Support/TreeSupport3D.hpp
Support/TreeSupportCommon.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.cpp
SurfaceCollection.hpp SurfaceCollection.hpp
Surface.cpp
Surface.hpp
SurfaceMesh.hpp SurfaceMesh.hpp
SVG.cpp SVG.cpp
SVG.hpp SVG.hpp
@@ -340,119 +429,28 @@ set(lisbslic3r_sources
Tesselate.cpp Tesselate.cpp
Tesselate.hpp Tesselate.hpp
TextConfiguration.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.cpp
Time.hpp Time.hpp
Timer.cpp Timer.cpp
Timer.hpp Timer.hpp
Thread.cpp TriangleMesh.cpp
Thread.hpp TriangleMesh.hpp
TriangleMeshSlicer.cpp
TriangleMeshSlicer.hpp
TriangleSelector.cpp TriangleSelector.cpp
TriangleSelector.hpp TriangleSelector.hpp
TriangleSetSampling.cpp TriangleSetSampling.cpp
TriangleSetSampling.hpp TriangleSetSampling.hpp
MTUtils.hpp TriangulateWall.cpp
TriangulateWall.hpp
utils.cpp
Utils.hpp
VariableWidth.cpp VariableWidth.cpp
VariableWidth.hpp VariableWidth.hpp
Zipper.hpp
Zipper.cpp 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) if (APPLE)
@@ -519,7 +517,7 @@ target_include_directories(libslic3r SYSTEM PUBLIC ${EXPAT_INCLUDE_DIRS})
# Find the OCCT and related libraries # Find the OCCT and related libraries
set(OpenCASCADE_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/occt") set(OpenCASCADE_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/occt")
find_package(OpenCASCADE REQUIRED) 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) find_package(JPEG REQUIRED)

File diff suppressed because it is too large Load Diff

View File

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