diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-10 14:29:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-10 14:29:43 +0300 |
| commit | 259ebdd017255c6ab8bd456d7f654d589b13872b (patch) | |
| tree | f31453e6cadf7d09fd056ad2986d9191c37d90e8 /tests/python/CMakeLists.txt | |
| parent | 632e0725d27271f95073f668a24bcf06f603f001 (diff) | |
Fix failing tests when Cycles is enabled
The --env-system-scripts hack does not work with it, it can't find the cycles
Python module then when importing add-ons.
Diffstat (limited to 'tests/python/CMakeLists.txt')
| -rw-r--r-- | tests/python/CMakeLists.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 076b0d958f1..b7f04a65dcd 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -15,8 +15,6 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # ***** END GPL LICENSE BLOCK ***** -# --env-system-scripts allows to run without the install target. - # Use '--write-blend=/tmp/test.blend' to view output # Some tests are interesting but take too long to run @@ -35,12 +33,10 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR}) #~ endif() # all calls to blender use this -if(APPLE) - if(${CMAKE_GENERATOR} MATCHES "Xcode") - set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup) - else() - set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts) - endif() +# --env-system-scripts allows to run without the install target, but does +# not work for all configurations. +if(WITH_CYCLES OR (APPLE AND (${CMAKE_GENERATOR} MATCHES "Xcode"))) + set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup) else() set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts) endif() |