forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
88bd994a37
@ -1,6 +1,6 @@
|
||||
|
||||
# Python CTests
|
||||
if(WITH_BLENDER)
|
||||
if(WITH_BLENDER AND WITH_PYTHON)
|
||||
add_subdirectory(python)
|
||||
endif()
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
# GTest
|
||||
if(WITH_GTESTS)
|
||||
|
||||
Include(GTestTesting)
|
||||
include(GTestTesting)
|
||||
|
||||
add_definitions(${GFLAGS_DEFINES})
|
||||
add_definitions(${GLOG_DEFINES})
|
||||
|
@ -116,21 +116,21 @@ add_test(
|
||||
# ------------------------------------------------------------------------------
|
||||
# MODELING TESTS
|
||||
add_test(
|
||||
NAME bevel
|
||||
NAME bmesh_bevel
|
||||
COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
|
||||
${TEST_SRC_DIR}/modeling/bevel_regression.blend
|
||||
--python-text run_tests
|
||||
)
|
||||
|
||||
add_test(
|
||||
NAME boolean
|
||||
NAME bmesh_boolean
|
||||
COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
|
||||
${TEST_SRC_DIR}/modeling/bool_regression.blend
|
||||
--python-text run_tests
|
||||
)
|
||||
|
||||
add_test(
|
||||
NAME split_faces
|
||||
NAME bmesh_split_faces
|
||||
COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
|
||||
${TEST_SRC_DIR}/modeling/split_faces_test.blend
|
||||
--python-text run_tests
|
||||
@ -139,7 +139,7 @@ add_test(
|
||||
# ------------------------------------------------------------------------------
|
||||
# MODIFIERS TESTS
|
||||
add_test(
|
||||
NAME modifier_array
|
||||
NAME object_modifier_array
|
||||
COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS}
|
||||
${TEST_SRC_DIR}/modifier_stack/array_test.blend
|
||||
--python-text run_tests
|
||||
|
Loading…
Reference in New Issue
Block a user