diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 08:55:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 08:55:39 +0300 |
| commit | d27158aae9bc48b2a07760a2dbe8e642fcecbe57 (patch) | |
| tree | 7ecfe898e53f07e589ee4be0ea5b297153d7dfcf /tests/python/CMakeLists.txt | |
| parent | f3161bd2abe4bcc41f0e9169275be315ecc6b054 (diff) | |
| parent | 8a76f8dac3475b1d24956e0d384d65295f15c76a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests/python/CMakeLists.txt')
| -rw-r--r-- | tests/python/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 20b65889c2b..568f66eb270 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -27,6 +27,7 @@ set(USE_EXPERIMENTAL_TESTS FALSE) set(TEST_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests) +set(TEST_DATA_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests_data) set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests) # ugh, any better way to do this on testing only? @@ -617,5 +618,14 @@ if(WITH_ALEMBIC) ) endif() -add_subdirectory(view_layer) +if(WITH_CODEC_FFMPEG) + add_python_test( + ffmpeg_tests + ${CMAKE_CURRENT_LIST_DIR}/ffmpeg_tests.py + --blender "$<TARGET_FILE:blender>" + --testdir "${TEST_DATA_SRC_DIR}/ffmpeg" + ) +endif() + add_subdirectory(collada) +add_subdirectory(view_layer) |