diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-21 23:35:13 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-21 23:35:13 (GMT) |
| commit | 4843022bf4755d7fafe58faee430a6f62f51ca8f (patch) | |
| tree | 34ce84fbfdbfb720b4aae4ae575f296341bbccab /tests/CMakeLists.txt | |
| parent | e31bb0f60312e692f5ef57fd3823e413cc8a669c (diff) | |
| parent | b211fe5158160910c73397bc401fb846c45a7295 (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5315c01..5e93680 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -203,7 +203,6 @@ set(CORE_SOURCES tests-common.cc ../src/mathc99.cc ../src/handle_dep.cc - ../src/qhash.cc ../src/value.cc ../src/expr.cc ../src/func.cc @@ -244,7 +243,6 @@ set(CGAL_SOURCES ../src/CGALEvaluator.cc ../src/CGALCache.cc ../src/PolySetCGALEvaluator.cc - ../src/qhash.cc ../src/CGAL_Nef_polyhedron_DxfData.cc ../src/cgaladv_minkowski2.cc ../src/cgaladv_convexhull2.cc) @@ -309,7 +307,7 @@ target_link_libraries(dumptest tests-common tests-nocgal ${QT_LIBRARIES} ${OPENG # # csgtexttest # -add_executable(csgtexttest csgtexttest.cc CSGTextRenderer.cc CSGTextCache.cc ../src/qhash.cc) +add_executable(csgtexttest csgtexttest.cc CSGTextRenderer.cc CSGTextCache.cc) target_link_libraries(csgtexttest tests-common tests-nocgal ${QT_LIBRARIES} ${OPENGL_LIBRARY} ${Boost_LIBRARIES}) # @@ -416,7 +414,8 @@ list(APPEND ECHO_FILES ${FUNCTION_FILES} ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/parser-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/builtin-tests.scad ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/dim-all.scad - ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/string-test.scad) + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/string-test.scad + ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/string-indexing.scad) # Add echotest tests to CTest add_cmdline_test(echotest txt ${ECHO_FILES}) |