blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-25 21:43:54 +10:00
parent dc3f404a70 7e9480b6cd
commit 0270941b70
Notes: blender-bot 2023-02-13 22:25:18 +01:00 
Referenced by issue #77065, Compositor Output Path Broken
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/CMakeLists.txt
View File

@ -19,7 +19,11 @@ elseif(APPLE)
set(TEST_BLENDER_EXE ${TEST_INSTALL_DIR}/Blender.app/Contents/MacOS/Blender)
set(_default_test_python_exe ${PYTHON_EXECUTABLE})
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(_default_test_python_exe ${PYTHON_EXECUTABLE})
endif()