juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-16 05:27:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: parameterize orcaslicer_copy_test_dlls() for printer_agent_plugin_tests"

Browse Source 
This reverts commit 2f566e3779.
This commit is contained in:
Ian Chua
2026-09-15 16:12:33 +08:00
parent 2f566e3779
commit e48f9f47d2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/CMakeLists.txt
+4 -4
View File
@@ -38,7 +38,7 @@ endif()
# the deps-built FFmpeg libraries and adds an $ORIGIN rpath, since the ELF # 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 # loader does not search the executable's directory and the CI unit-test runner
# only receives the tests artifact (no deps install). # only receives the tests artifact (no deps install).
function(orcaslicer_copy_test_dlls TARGET) function(orcaslicer_copy_test_dlls)
if (WIN32) if (WIN32)
set(_configs ${CMAKE_CONFIGURATION_TYPES}) set(_configs ${CMAKE_CONFIGURATION_TYPES})
if (NOT _configs) 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 # 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 # rpath so the loader finds them when the tests run on the CI unit-test
# runner, which only receives this build/tests tree. # 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) if (NOT "libslic3r_gui" IN_LIST _linked_libs)
return() return()
endif() endif()
set_property(TARGET ${TARGET} PROPERTY BUILD_RPATH "$ORIGIN") set_property(TARGET ${_TEST_NAME}_tests PROPERTY BUILD_RPATH "$ORIGIN")
set(_configs ${CMAKE_CONFIGURATION_TYPES}) set(_configs ${CMAKE_CONFIGURATION_TYPES})
if (NOT _configs) if (NOT _configs)
set(_configs "${CMAKE_BUILD_TYPE}") set(_configs "${CMAKE_BUILD_TYPE}")
endif() endif()
foreach(_cfg IN LISTS _configs) foreach(_cfg IN LISTS _configs)
orcaslicer_copy_sos(${TARGET} "${_cfg}" "" _unused_sos) orcaslicer_copy_sos(${_TEST_NAME}_tests "${_cfg}" "" _unused_sos)
endforeach() endforeach()
endif() endif()
endfunction() endfunction()
tests/slic3rutils/CMakeLists.txt
+2 -2
View File
@@ -31,7 +31,7 @@ endif ()
target_link_libraries(${_TEST_NAME}_tests test_common libslic3r_gui libslic3r pybind11::embed Catch2::Catch2WithMain) target_link_libraries(${_TEST_NAME}_tests test_common libslic3r_gui libslic3r pybind11::embed Catch2::Catch2WithMain)
set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests") 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) 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. # beside the shared test output dir; serialize them so the copies can't race.
add_dependencies(printer_agent_plugin_tests ${_TEST_NAME}_tests) 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) orcaslicer_stage_test_python_runtime(printer_agent_plugin_tests)