[Bf-blender-cvs] [6877a7b3ff6] master: Fix running tests when building without portable install.
Sebastian Parborg
noreply at git.blender.org
Thu Sep 24 18:35:44 CEST 2020
Commit: 6877a7b3ff6acc94b572dfab6c581ef6ed74e4f0
Author: Sebastian Parborg
Date: Thu Sep 24 18:34:55 2020 +0200
Branches: master
https://developer.blender.org/rB6877a7b3ff6acc94b572dfab6c581ef6ed74e4f0
Fix running tests when building without portable install.
===================================================================
M tests/gtests/runner/CMakeLists.txt
===================================================================
diff --git a/tests/gtests/runner/CMakeLists.txt b/tests/gtests/runner/CMakeLists.txt
index c1487e45b26..6640d798ed6 100644
--- a/tests/gtests/runner/CMakeLists.txt
+++ b/tests/gtests/runner/CMakeLists.txt
@@ -86,7 +86,11 @@ set(_GOOGLETEST_DISCOVER_TESTS_SCRIPT
if(APPLE)
set(_test_release_dir ${TEST_INSTALL_DIR}/Blender.app/Contents/Resources/${BLENDER_VERSION})
else()
- set(_test_release_dir ${TEST_INSTALL_DIR}/${BLENDER_VERSION})
+ if(WIN32 OR WITH_INSTALL_PORTABLE)
+ set(_test_release_dir ${TEST_INSTALL_DIR}/${BLENDER_VERSION})
+ else()
+ set(_test_release_dir ${TEST_INSTALL_DIR}/share/blender/${BLENDER_VERSION})
+ endif()
endif()
gtest_discover_tests(blender_test
More information about the Bf-blender-cvs
mailing list