diff options
| author | Marius Kintel <marius@kintel.net> | 2013-10-13 17:19:34 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-10-13 17:19:34 (GMT) |
| commit | e77615be3027cfe365e3e52f3ed609dae9711028 (patch) | |
| tree | 21babea118b3bc59037e4e487a4c6bd6811b5412 /tests/CMakeLists.txt | |
| parent | 0f22d6e9ad562e87ae484a82df56ddee30e87343 (diff) | |
| parent | 4401a136b9cbf01aa99cfdf5d9d67d62579dd853 (diff) | |
Merge branch 'children' of git://github.com/vicnet/openscad into vicnet-children
Conflicts:
tests/CMakeLists.txt
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7f35bb7..2957240 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -776,7 +776,8 @@ list(APPEND ECHO_FILES ${FUNCTION_FILES} ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/variable-scope-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/lookup-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/expression-shortcircuit-tests.scad - ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/parent_module-tests.scad) + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/parent_module-tests.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/children-tests.scad) list(APPEND DUMPTEST_FILES ${FEATURES_FILES} ${EXAMPLE_FILES}) list(APPEND DUMPTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/escape-test.scad |