[Bf-blender-cvs] [7e9480b6cd7] blender-v2.83-release: Tests: correct the blender path for non-portable installations
Campbell Barton
noreply at git.blender.org
Mon May 25 13:28:34 CEST 2020
Commit: 7e9480b6cd74d23fddcf20ec2ed414144f1c6ba3
Author: Campbell Barton
Date: Mon May 25 21:28:03 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB7e9480b6cd74d23fddcf20ec2ed414144f1c6ba3
Tests: correct the blender path for non-portable installations
===================================================================
M tests/CMakeLists.txt
===================================================================
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 966572b23e7..8f6edcff482 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,7 +19,11 @@ elseif(APPLE)
set(TEST_BLENDER_EXE ${TEST_INSTALL_DIR}/Blender.app/Contents/MacOS/Blender)
set(TEST_PYTHON_EXE)
else()
- set(TEST_BLENDER_EXE ${TEST_INSTALL_DIR}/blender)
+ if(WITH_INSTALL_PORTABLE)
+ set(TEST_BLENDER_EXE ${TEST_INSTALL_DIR}/blender)
+ else()
+ set(TEST_BLENDER_EXE ${TEST_INSTALL_DIR}/bin/blender)
+ endif()
set(TEST_PYTHON_EXE)
endif()
More information about the Bf-blender-cvs
mailing list