mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-16 07:22:10 +00:00
8cb0cb7693
Resolve five conflicts, all of which needed both sides rather than a pick: - BackgroundSlicingProcess: ours was a pure tabs->spaces reformat of base, so keep main's per-filament volume/nozzle map read-back (its only change here). - GUI_App: main's #12506 else-if attached to an `if` this branch deleted; re-expressed onto the same-agent early-return path (the agent factory caches per id, so pointer equality is the same predicate). - MainFrame: both sides relocated Sync Presets independently; keep main's push_notification plus the branch's Plugins menu items. - Tab: the "TODO: Orca: Support hybrid" blocks were unchanged base, not a branch decision; take main's enabled Hybrid to match the already auto-merged siblings. - test_config: union of both sides' cases (6 plugin + 9 multi-nozzle).
27 lines
697 B
CMake
27 lines
697 B
CMake
get_filename_component(_TEST_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
|
|
add_executable(${_TEST_NAME}_tests
|
|
${_TEST_NAME}_tests.cpp
|
|
test_helpers.cpp
|
|
test_helpers.hpp
|
|
test_cooling.cpp
|
|
test_extrusion_entity.cpp
|
|
test_fill.cpp
|
|
test_flow.cpp
|
|
test_gcode_timing.cpp
|
|
test_gcodewriter.cpp
|
|
test_model.cpp
|
|
test_multifilament.cpp
|
|
test_print.cpp
|
|
test_printobject.cpp
|
|
test_skirt_brim.cpp
|
|
test_slicing_pipeline_hook.cpp
|
|
test_support_material.cpp
|
|
test_trianglemesh.cpp
|
|
)
|
|
target_link_libraries(${_TEST_NAME}_tests test_common libslic3r Catch2::Catch2WithMain)
|
|
set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests")
|
|
|
|
orcaslicer_copy_test_dlls()
|
|
|
|
orcaslicer_discover_tests(${_TEST_NAME}_tests)
|