![Lukas Matena](/assets/img/avatar_default.png)
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250. Version master_250 of t/perimeters.t left in tree. CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp CONFLICT (content): Merge conflict in version.inc CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250. Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
41 lines
1,014 B
CMake
41 lines
1,014 B
CMake
get_filename_component(_TEST_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
|
|
add_executable(${_TEST_NAME}_tests
|
|
${_TEST_NAME}_tests.cpp
|
|
<<<<<<< HEAD
|
|
test_avoid_crossing_perimeters.cpp
|
|
test_bridges.cpp
|
|
test_cooling.cpp
|
|
test_clipper.cpp
|
|
test_custom_gcode.cpp
|
|
=======
|
|
test_clipper.cpp
|
|
>>>>>>> master_250
|
|
test_data.cpp
|
|
test_data.hpp
|
|
test_extrusion_entity.cpp
|
|
test_fill.cpp
|
|
test_flow.cpp
|
|
test_gaps.cpp
|
|
test_gcode.cpp
|
|
test_gcodefindreplace.cpp
|
|
test_gcodewriter.cpp
|
|
test_model.cpp
|
|
test_multi.cpp
|
|
test_perimeters.cpp
|
|
test_print.cpp
|
|
test_printgcode.cpp
|
|
test_printobject.cpp
|
|
test_skirt_brim.cpp
|
|
test_support_material.cpp
|
|
test_thin_walls.cpp
|
|
test_trianglemesh.cpp
|
|
)
|
|
target_link_libraries(${_TEST_NAME}_tests test_common libslic3r)
|
|
set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests")
|
|
|
|
if (WIN32)
|
|
prusaslicer_copy_dlls(${_TEST_NAME}_tests)
|
|
endif()
|
|
|
|
# catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ")
|
|
add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests ${CATCH_EXTRA_ARGS})
|