Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-08-24 17:21:56 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-08-24 21:21:59 +0300
commitfbfcc5a544a1dc4c593235d85ae3b98728c7427c (patch)
tree0f8912e15ff5e7ab865d4e446799d7addbd7d1b6 /tests
parent659bcb3b1023c30e2ce5daa0836f71f52f67c9e6 (diff)
Make OpenImageIO and OpenEXR dynamic libraries work on Linux / macOS
I tried to make the mechanism for setting the right environment for oslc and idiff a bit more generic, hopefully did not break Windows.
Diffstat (limited to 'tests')
-rw-r--r--tests/python/CMakeLists.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index ce4ebb2ac77..57f4fa72b47 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -31,8 +31,8 @@ function(add_blender_test testname)
set_tests_properties(${testname} PROPERTIES ENVIRONMENT
LSAN_OPTIONS=exitcode=0:$ENV{LSAN_OPTIONS}
)
- if(WIN32)
- set_tests_properties(${testname} PROPERTIES ENVIRONMENT "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/;$ENV{PATH}")
+ if(PLATFORM_ENV_INSTALL)
+ set_tests_properties(${testname} PROPERTIES ENVIRONMENT "${PLATFORM_ENV_INSTALL}")
endif()
endfunction()
@@ -50,8 +50,8 @@ function(add_python_test testname testscript)
set_tests_properties(${testname} PROPERTIES ENVIRONMENT
LSAN_OPTIONS=exitcode=0:$ENV{LSAN_OPTIONS}
)
- if(WIN32)
- set_tests_properties(${testname} PROPERTIES ENVIRONMENT "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/;$ENV{PATH}")
+ if(PLATFORM_ENV_INSTALL)
+ set_tests_properties(${testname} PROPERTIES ENVIRONMENT "${PLATFORM_ENV_INSTALL}")
endif()
endfunction()