From e48f9f47d247aa66b58c58968aa49261637c2966 Mon Sep 17 00:00:00 2001 From: Ian Chua Date: Tue, 15 Sep 2026 16:12:33 +0800 Subject: [PATCH] Revert "fix: parameterize orcaslicer_copy_test_dlls() for printer_agent_plugin_tests" This reverts commit 2f566e377905e3398e87e2c9fdf08a045829bef1. --- tests/CMakeLists.txt | 8 ++++---- tests/slic3rutils/CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9009700acd..cd9bfea1c2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -38,7 +38,7 @@ endif() # the deps-built FFmpeg libraries and adds an $ORIGIN rpath, since the ELF # loader does not search the executable's directory and the CI unit-test runner # only receives the tests artifact (no deps install). -function(orcaslicer_copy_test_dlls TARGET) +function(orcaslicer_copy_test_dlls) if (WIN32) set(_configs ${CMAKE_CONFIGURATION_TYPES}) if (NOT _configs) @@ -57,18 +57,18 @@ function(orcaslicer_copy_test_dlls TARGET) # into it). Copy them next to the executable and give it an $ORIGIN # rpath so the loader finds them when the tests run on the CI unit-test # runner, which only receives this build/tests tree. - get_target_property(_linked_libs ${TARGET} LINK_LIBRARIES) + get_target_property(_linked_libs ${_TEST_NAME}_tests LINK_LIBRARIES) if (NOT "libslic3r_gui" IN_LIST _linked_libs) return() endif() - set_property(TARGET ${TARGET} PROPERTY BUILD_RPATH "$ORIGIN") + set_property(TARGET ${_TEST_NAME}_tests PROPERTY BUILD_RPATH "$ORIGIN") set(_configs ${CMAKE_CONFIGURATION_TYPES}) if (NOT _configs) set(_configs "${CMAKE_BUILD_TYPE}") endif() foreach(_cfg IN LISTS _configs) - orcaslicer_copy_sos(${TARGET} "${_cfg}" "" _unused_sos) + orcaslicer_copy_sos(${_TEST_NAME}_tests "${_cfg}" "" _unused_sos) endforeach() endif() endfunction() diff --git a/tests/slic3rutils/CMakeLists.txt b/tests/slic3rutils/CMakeLists.txt index 11aca7dac6..fbf0eaa901 100644 --- a/tests/slic3rutils/CMakeLists.txt +++ b/tests/slic3rutils/CMakeLists.txt @@ -31,7 +31,7 @@ endif () target_link_libraries(${_TEST_NAME}_tests test_common libslic3r_gui libslic3r pybind11::embed Catch2::Catch2WithMain) set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests") -orcaslicer_copy_test_dlls(${_TEST_NAME}_tests) +orcaslicer_copy_test_dlls() orcaslicer_stage_test_python_runtime(${_TEST_NAME}_tests) @@ -52,7 +52,7 @@ set_property(TARGET printer_agent_plugin_tests PROPERTY FOLDER "tests") # beside the shared test output dir; serialize them so the copies can't race. add_dependencies(printer_agent_plugin_tests ${_TEST_NAME}_tests) -orcaslicer_copy_test_dlls(printer_agent_plugin_tests) +orcaslicer_copy_test_dlls() orcaslicer_stage_test_python_runtime(printer_agent_plugin_tests)