From f69d88ed1f9f19c8ba7ab135d654695c7e5fea8f Mon Sep 17 00:00:00 2001 From: Aaron Rossetto Date: Tue, 15 Jun 2021 09:42:30 -0500 Subject: mpm: tests: Add lib/ to library load path Ensure that DYLD_LIBRARY_PATH on OS X or LD_LIBRARY_PATH on Linux platforms is set appropriately before invoking MPM's Python unit tests. --- mpm/python/tests/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mpm') diff --git a/mpm/python/tests/CMakeLists.txt b/mpm/python/tests/CMakeLists.txt index 36bff9d3a..2a08c2f0b 100755 --- a/mpm/python/tests/CMakeLists.txt +++ b/mpm/python/tests/CMakeLists.txt @@ -7,10 +7,17 @@ ######################################################################## # This file included, use CMake directory variables ######################################################################## - add_test( NAME mpm_unit_tests COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_BINARY_DIR}/python ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/run_unit_tests.py ${MPM_DEVICE} ) + +if(APPLE) + set_tests_properties(mpm_unit_tests PROPERTIES + ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$DYLD_LIBRARY_PATH") +else() + set_tests_properties(mpm_unit_tests PROPERTIES + ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$LD_LIBRARY_PATH") +endif() -- cgit v1.2.3