summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-10-16 16:10:22 (GMT)
committerMarius Kintel <marius@kintel.net>2011-10-16 16:10:22 (GMT)
commit1dcfd7627bf5579123bd4870825caa7a2eac430b (patch)
treeb04a9626d3a79f38e0cbb0717f03709591bf6728
parent790c9a19258876b93781b70af14c71915a746904 (diff)
parent913869bb664dc1c239fa5c9914b9b02a575abd9e (diff)
Merge branch 'master' into visitortests
Conflicts: tests/CMakeLists.txt tests/echotest.cc
-rw-r--r--doc/TODO.txt1
-rw-r--r--tests/CMakeLists.txt6
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/TODO.txt b/doc/TODO.txt
index 65534b8..2202792 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -116,6 +116,7 @@ o Misc
(e.g Preview, Render)
- If trying to export STL/DXF but source is newer than the CGAL rendering, ask
for confirmation.
+ - Go through keyboard shortcuts and make them more conformant to platform standards
o Cmd-line
- Add verbose option (PRINT command from mainwin.cc and progress output)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 80af81f..76a08ec 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -195,6 +195,12 @@ add_executable(echotest echotest.cc ${CORE_SOURCES})
target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
#
+# echotest
+#
+add_executable(echotest echotest.cc ${CORE_SOURCES})
+target_link_libraries(echotest ${QT_LIBRARIES} ${OPENGL_LIBRARY})
+
+#
# Offscreen OpenGL context source code
#
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
contact: Jan Huwald // Impressum