diff options
| author | don <don@shelley.tu.ok.cox.net> | 2011-10-20 00:37:00 (GMT) |
|---|---|---|
| committer | don <don@shelley.tu.ok.cox.net> | 2011-10-20 00:37:00 (GMT) |
| commit | c7a809e0fd653795a93642301bbff8a27581ea57 (patch) | |
| tree | 369f16bedb215c2a936580960375cf9825a0f1fc | |
| parent | 0356c77a2fece07b1376e2bd12cfba5e44d16091 (diff) | |
fix broken build
| -rw-r--r-- | tests/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/FindGLEW.cmake | 2 | ||||
| -rw-r--r-- | tests/system-gl.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 40286dd..1fca2fe 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -253,7 +253,7 @@ include_directories(${CGAL_INCLUDE_DIRS}) # # cgaltest # -add_executable(cgaltest cgaltest.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc ../src/CSGTermEvaluator.cc +add_executable(cgaltest cgaltest.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc ../src/CSGTermEvaluator.cc system-gl.cc ../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 ${COMMON_SOURCES}) @@ -263,7 +263,7 @@ target_link_libraries(cgaltest ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_ # # cgalpngtest # -add_executable(cgalpngtest cgalpngtest.cc OffscreenView.cc bboxhelp.cc ${OFFSCREEN_CTX_SOURCE} imageutils.cc fbo.cc +add_executable(cgalpngtest cgalpngtest.cc OffscreenView.cc bboxhelp.cc ${OFFSCREEN_CTX_SOURCE} imageutils.cc fbo.cc system-gl.cc ../src/CGALRenderer.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc ../src/CSGTermEvaluator.cc ../src/CGALEvaluator.cc ../src/CGALCache.cc ../src/PolySetCGALEvaluator.cc ../src/qhash.cc @@ -276,7 +276,7 @@ target_link_libraries(cgalpngtest ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${ # opencsgtest # -add_executable(opencsgtest opencsgtest.cc csgtestcore.cc OffscreenView.cc ${OFFSCREEN_CTX_SOURCE} imageutils.cc fbo.cc +add_executable(opencsgtest opencsgtest.cc csgtestcore.cc OffscreenView.cc ${OFFSCREEN_CTX_SOURCE} imageutils.cc fbo.cc system-gl.cc ../src/OpenCSGRenderer.cc ../src/ThrownTogetherRenderer.cc ../src/CSGTermEvaluator.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc ../src/CGALEvaluator.cc ../src/CGALCache.cc ../src/PolySetCGALEvaluator.cc ../src/qhash.cc diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake index f49d546..bd0669d 100644 --- a/tests/FindGLEW.cmake +++ b/tests/FindGLEW.cmake @@ -30,7 +30,7 @@ IF (WIN32) ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib DOC "The GLEW library") ELSE (WIN32) - message("GLEW_DIR: " ${GLEW_DIR}) + message("-- GLEW_DIR: " ${GLEW_DIR}) FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h PATHS ${GLEW_DIR}/include /usr/include /usr/local/include NO_DEFAULT_PATH diff --git a/tests/system-gl.cc b/tests/system-gl.cc index 00108cd..8874662 100644 --- a/tests/system-gl.cc +++ b/tests/system-gl.cc @@ -38,8 +38,8 @@ bool report_glerror(const char * function) GLenum tGLErr = glGetError(); if (tGLErr != GL_NO_ERROR) { if ( (tGLErr-0x500)<=3 && (tGLErr-0x500)>=0 ) - cerr << "OpenGL error " << hex << tGLErr << "(" << - << gl_errors[tGLErr-0x500] << ") while " << task << endl; + cerr << "OpenGL error " << hex << tGLErr << "(" + << gl_errors[tGLErr-0x500] << ") while " << function << endl; else cerr << "OpenGL error 0x" << hex << tGLErr << " after " << function << endl; return true; |