diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-04 19:06:40 (GMT) |
| commit | 799ca1d1b3f2e9142460ab3ce895a0641f54dfda (patch) | |
| tree | 6c168de6d55cb92b94b0ddeb54c668bd4946c10d /tests/CMakeLists.txt | |
| parent | 9259d57659f61e9e56942bb36125f605f8f3c338 (diff) | |
| parent | f5e0f3a531b0c8806e4ebc62cd91ca31275ae481 (diff) | |
Merge branch 'master' into visitortests
Conflicts:
src/polyset.h
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9e6ae0a..4ef7bf3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -93,7 +93,7 @@ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/parser_yacc.c PROPERTIES # Internal includes include_directories(../src) -add_definitions(-DOPENSCAD_VERSION=test) +add_definitions(-DOPENSCAD_VERSION=test -DOPENSCAD_YEAR=2011 -DOPENSCAD_MONTH=10) set(COMMON_SOURCES ../src/handle_dep.cc @@ -241,6 +241,7 @@ enable_testing() file(GLOB MINIMAL_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/minimal/*.scad) file(GLOB FEATURES_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/*.scad) file(GLOB BUGS_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/bugs/*.scad) +file(GLOB SCAD_DXF_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/dxf/*.scad) # Add dumptest tests to CTest add_cmdline_test(dumptest txt ${MINIMAL_FILES}) @@ -287,6 +288,7 @@ LIST(APPEND CGALPNGTEST_FILES ${CMAKE_SOURCE_DIR}/../testdata/scad/features/include-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/features/child-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/features/ifelse-tests.scad) +LIST(APPEND CGALPNGTEST_FILES ${SCAD_DXF_FILES}) #LIST(APPEND CGALPNGTEST_FILES ${CMAKE_SOURCE_DIR}/../examples/example001.scad) add_cmdline_test(cgalpngtest png ${CGALPNGTEST_FILES}) @@ -295,6 +297,7 @@ 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) +LIST(APPEND OPENCSGTEST_FILES ${SCAD_DXF_FILES}) add_cmdline_test(opencsgtest png ${OPENCSGTEST_FILES}) # Add throwntogether tests to CTest |