diff options
| author | Marius Kintel <marius@kintel.net> | 2011-10-16 16:10:22 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-10-16 16:10:22 (GMT) |
| commit | 1dcfd7627bf5579123bd4870825caa7a2eac430b (patch) | |
| tree | b04a9626d3a79f38e0cbb0717f03709591bf6728 /tests | |
| parent | 790c9a19258876b93781b70af14c71915a746904 (diff) | |
| parent | 913869bb664dc1c239fa5c9914b9b02a575abd9e (diff) | |
Merge branch 'master' into visitortests
Conflicts:
tests/CMakeLists.txt
tests/echotest.cc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
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") |