summaryrefslogtreecommitdiff
path: root/tests/CMakeLists.txt
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-09-28 23:57:52 (GMT)
committerMarius Kintel <marius@kintel.net>2011-09-28 23:57:52 (GMT)
commit2b3c140bd264f8a5cf94d3fa83f875933fbb4928 (patch)
tree91a96f286fe13d6530de513faa53249a669da44c /tests/CMakeLists.txt
parent6c3ce9934755bcc579ac30104d651608c2c71622 (diff)
parentda08b50c03418110a74a6f2667be1d916b607b87 (diff)
Merge branch 'master' into visitortests
Conflicts: tests/opencsgtest.cc
Diffstat (limited to 'tests/CMakeLists.txt')
-rw-r--r--tests/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dca608d..a0db0e4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -291,6 +291,9 @@ add_cmdline_test(cgalpngtest png ${CGALPNGTEST_FILES})
# Add opencsg tests to CTest
LIST(APPEND OPENCSGTEST_FILES ${CGALPNGTEST_FILES})
+LIST(APPEND OPENCSGTEST_FILES
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/features/highlight-and-background-modifier.scad
+ ${CMAKE_SOURCE_DIR}/../testdata/scad/features/child-background.scad)
add_cmdline_test(opencsgtest png ${OPENCSGTEST_FILES})
# Add throwntogether tests to CTest
contact: Jan Huwald // Impressum