diff options
Diffstat (limited to 'tests')
71 files changed, 0 insertions, 141 deletions
diff --git a/tests/asmparsertest/CMakeLists.gl.txt b/tests/asmparsertest/CMakeLists.gl.txt index ee74560b..b2efb9b7 100644 --- a/tests/asmparsertest/CMakeLists.gl.txt +++ b/tests/asmparsertest/CMakeLists.gl.txt @@ -2,13 +2,11 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (asmparsertest asmparsertest.c) diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt index 50f0715b..64c30937 100644 --- a/tests/bugs/CMakeLists.gl.txt +++ b/tests/bugs/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -10,7 +9,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (crash-cubemap-order crash-cubemap-order.c) diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt index aa863b0c..ddfbbef9 100644 --- a/tests/egl/CMakeLists.gl.txt +++ b/tests/egl/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( @@ -10,7 +9,6 @@ link_libraries ( ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${OPENGL_egl_LIBRARY} - ${GLUT_glut_LIBRARY} ) IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt index 34ac405a..8e120e76 100644 --- a/tests/fbo/CMakeLists.gl.txt +++ b/tests/fbo/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -10,7 +9,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (fbo-1d fbo-1d.c) diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt index 2c93b56a..49e15ba6 100644 --- a/tests/general/CMakeLists.gl.txt +++ b/tests/general/CMakeLists.gl.txt @@ -2,14 +2,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (array-stride array-stride.c) diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt index aadb9c41..fb06cbc7 100644 --- a/tests/glean/CMakeLists.gl.txt +++ b/tests/glean/CMakeLists.gl.txt @@ -11,7 +11,6 @@ ENDIF () include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${TIFF_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/util ) @@ -93,7 +92,6 @@ target_link_libraries (glean piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ${X11_X11_LIB} ${TIFF_LIBRARY} ${CARBON_LIBRARY} diff --git a/tests/glslparsertest/CMakeLists.gl.txt b/tests/glslparsertest/CMakeLists.gl.txt index f78e1795..c2e9ba9a 100644 --- a/tests/glslparsertest/CMakeLists.gl.txt +++ b/tests/glslparsertest/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (glslparsertest glslparsertest.c) diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt index fc00635e..874991b4 100644 --- a/tests/glx/CMakeLists.gl.txt +++ b/tests/glx/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) if(BUILD_GLX_TESTS) @@ -14,7 +13,6 @@ endif(BUILD_GLX_TESTS) link_libraries ( ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) IF(BUILD_GLX_TESTS) diff --git a/tests/hiz/CMakeLists.gl.txt b/tests/hiz/CMakeLists.gl.txt index cd646f27..28d8f857 100644 --- a/tests/hiz/CMakeLists.gl.txt +++ b/tests/hiz/CMakeLists.gl.txt @@ -3,7 +3,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) piglit_add_library(hiz-util @@ -16,7 +15,6 @@ link_libraries ( ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable(hiz-depth-stencil-test-fbo-d0-s8 hiz-depth-stencil-test-fbo-d0-s8.c) diff --git a/tests/mesa/tests/CMakeLists.gl.txt b/tests/mesa/tests/CMakeLists.gl.txt index dc60f8ec..ba95ce53 100644 --- a/tests/mesa/tests/CMakeLists.gl.txt +++ b/tests/mesa/tests/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -9,7 +8,6 @@ include_directories( link_libraries ( ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ${PNG_LIBRARIES} mesautil ) diff --git a/tests/mesa/util/CMakeLists.gl.txt b/tests/mesa/util/CMakeLists.gl.txt index d06db3a9..f70ad417 100644 --- a/tests/mesa/util/CMakeLists.gl.txt +++ b/tests/mesa/util/CMakeLists.gl.txt @@ -2,14 +2,12 @@ include_directories ( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ${PNG_LIBRARIES} ) add_definitions ( diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt index 9efc26ac..4a5a1747 100644 --- a/tests/shaders/CMakeLists.gl.txt +++ b/tests/shaders/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -10,7 +9,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (glsl-max-vertex-attrib glsl-max-vertex-attrib.c) diff --git a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt index 94f8795d..2f9a36c8 100644 --- a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt +++ b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (amd_seamless_cubemap_per_texture amd_seamless_cubemap_per_texture.c) diff --git a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt index 27e92040..926e50d7 100644 --- a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt +++ b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_blend_func_extended-bindfragdataindexed-invalid-parameters bindfragdataindexed-invalid-parameters.c) diff --git a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt index 4f25d4c3..ed7d96cb 100644 --- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt +++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_blend_func_extended-fbo-extended-blend fbo-extended-blend.c) diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt index 4db9a006..9bab8b2e 100644 --- a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt +++ b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_color_buffer_float-getteximage getteximage.c) diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt index 017b526d..fc3829d1 100644 --- a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt +++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (copy_buffer_coherency copy_buffer_coherency.c) diff --git a/tests/spec/arb_debug_output/CMakeLists.gl.txt b/tests/spec/arb_debug_output/CMakeLists.gl.txt index 17365891..77f0feb1 100644 --- a/tests/spec/arb_debug_output/CMakeLists.gl.txt +++ b/tests/spec/arb_debug_output/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_debug_output-api_error api_error.c) diff --git a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt index dd4aaed8..a28660ba 100644 --- a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt +++ b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_draw_buffers-state_change state_change.c) diff --git a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt index 04174eee..a2b3dec5 100644 --- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt +++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (draw-elements-instanced-base-vertex draw-elements-instanced-base-vertex.c) diff --git a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt index 590127de..532f0fad 100644 --- a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt +++ b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_draw_instanced-dlist dlist.c) diff --git a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt index abac5a13..82245d2f 100644 --- a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt +++ b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -10,7 +9,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_es2_compatibility-depthrangef arb_es2_compatibility-depthrangef.c) diff --git a/tests/spec/arb_fragment_program/CMakeLists.gl.txt b/tests/spec/arb_fragment_program/CMakeLists.gl.txt index 2d51b723..545e6da5 100644 --- a/tests/spec/arb_fragment_program/CMakeLists.gl.txt +++ b/tests/spec/arb_fragment_program/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_fragment_program-minmax minmax.c) diff --git a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt index 07833581..ac17f81d 100644 --- a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt +++ b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable(get-renderbuffer-internalformat get-renderbuffer-internalformat.c) diff --git a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt index d9685c5e..1c75bcf5 100644 --- a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt +++ b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (instanced_arrays instanced_arrays.c) diff --git a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt index cd9d6e41..eaf9217f 100644 --- a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt +++ b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (map_buffer_range_error_check map_buffer_range_error_check.c) diff --git a/tests/spec/arb_multisample/CMakeLists.gl.txt b/tests/spec/arb_multisample/CMakeLists.gl.txt index 623900db..08110580 100644 --- a/tests/spec/arb_multisample/CMakeLists.gl.txt +++ b/tests/spec/arb_multisample/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_multisample-beginend beginend.c) diff --git a/tests/spec/arb_robustness/CMakeLists.gl.txt b/tests/spec/arb_robustness/CMakeLists.gl.txt index e19a598f..5bd3c25b 100644 --- a/tests/spec/arb_robustness/CMakeLists.gl.txt +++ b/tests/spec/arb_robustness/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/spec/arb_robustness ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_robustness_draw-vbo-bounds draw-vbo-bounds.c) diff --git a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt index 1046be8f..479fe488 100644 --- a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt +++ b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (sampler-objects sampler-objects.c) diff --git a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt index 2a6bdd3b..6f25470f 100644 --- a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt +++ b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_seamless_cubemap arb_seamless_cubemap.c) diff --git a/tests/spec/arb_shader_objects/CMakeLists.gl.txt b/tests/spec/arb_shader_objects/CMakeLists.gl.txt index 12b16d52..e2b59421 100644 --- a/tests/spec/arb_shader_objects/CMakeLists.gl.txt +++ b/tests/spec/arb_shader_objects/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_shader_objects-bindattriblocation-scratch-name bindattriblocation-scratch-name.c) diff --git a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt index e1e83f85..7ddc5808 100644 --- a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt +++ b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_shader_texture_lod-texgrad texgrad.c) diff --git a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt index fd71ff70..23dcfadc 100644 --- a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt +++ b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_texture_buffer_object-dlist dlist.c) diff --git a/tests/spec/arb_texture_compression/CMakeLists.gl.txt b/tests/spec/arb_texture_compression/CMakeLists.gl.txt index 0e09dcc0..55039e19 100644 --- a/tests/spec/arb_texture_compression/CMakeLists.gl.txt +++ b/tests/spec/arb_texture_compression/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_texture_compression-internal-format-query internal-format-query.c) diff --git a/tests/spec/arb_texture_float/CMakeLists.gl.txt b/tests/spec/arb_texture_float/CMakeLists.gl.txt index 14df21f5..b8fdfdea 100644 --- a/tests/spec/arb_texture_float/CMakeLists.gl.txt +++ b/tests/spec/arb_texture_float/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_texture_float-texture-float-formats texture-float-formats.c) diff --git a/tests/spec/arb_texture_storage/CMakeLists.gl.txt b/tests/spec/arb_texture_storage/CMakeLists.gl.txt index a4d33d40..725349ad 100644 --- a/tests/spec/arb_texture_storage/CMakeLists.gl.txt +++ b/tests/spec/arb_texture_storage/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_texture_storage-texture-storage texture-storage.c) diff --git a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt index fe4e04d3..09fb9f9b 100644 --- a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt +++ b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_transform_feedback2-draw-auto draw-auto.c) diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt index c70e3406..342ffede 100644 --- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt +++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) add_executable (arb_uniform_buffer_object-getuniformblockindex getuniformblockindex.c) diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt index 60b0d6ac..3cd5a5a0 100644 --- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt +++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_vertex_buffer_object-elements-negative-offset elements-negative-offset.c) diff --git a/tests/spec/arb_vertex_program/CMakeLists.gl.txt b/tests/spec/arb_vertex_program/CMakeLists.gl.txt index a6e62525..8a792262 100644 --- a/tests/spec/arb_vertex_program/CMakeLists.gl.txt +++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (arb_vertex_program-getenv4d-with-error getenv4d-with-error.c) diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt b/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt index 8cfc832d..5e9d9dc2 100644 --- a/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt +++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (draw-vertices-2101010 draw-vertices-2101010.c) diff --git a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt index f333e8ff..d5bef570 100644 --- a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt +++ b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ati_draw_buffers-arbfp arbfp.c) diff --git a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt index a1d5a002..412bb017 100644 --- a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt +++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ati_envmap_bumpmap-bump bump.c) diff --git a/tests/spec/ext_fog_coord/CMakeLists.gl.txt b/tests/spec/ext_fog_coord/CMakeLists.gl.txt index 86e45055..b491b378 100644 --- a/tests/spec/ext_fog_coord/CMakeLists.gl.txt +++ b/tests/spec/ext_fog_coord/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ext_fog_coord-modes modes.c) diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt index 475237c4..43aab2f5 100644 --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ext_framebuffer_multisample-accuracy common.cpp accuracy.cpp) diff --git a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt index 94c77b93..8ca8002b 100644 --- a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt +++ b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ext_packed_depth_stencil-readpixels-24_8 readpixels-24_8.c) diff --git a/tests/spec/ext_packed_float/CMakeLists.gl.txt b/tests/spec/ext_packed_float/CMakeLists.gl.txt index a0e6fabd..9b33aa6f 100644 --- a/tests/spec/ext_packed_float/CMakeLists.gl.txt +++ b/tests/spec/ext_packed_float/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ext_packed_float-pack pack.c) diff --git a/tests/spec/ext_texture_array/CMakeLists.gl.txt b/tests/spec/ext_texture_array/CMakeLists.gl.txt index 578cc03c..16484122 100644 --- a/tests/spec/ext_texture_array/CMakeLists.gl.txt +++ b/tests/spec/ext_texture_array/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ext_texture_array-maxlayers maxlayers.c) diff --git a/tests/spec/ext_texture_integer/CMakeLists.gl.txt b/tests/spec/ext_texture_integer/CMakeLists.gl.txt index 072996a3..674e151a 100644 --- a/tests/spec/ext_texture_integer/CMakeLists.gl.txt +++ b/tests/spec/ext_texture_integer/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ext_texture_integer-fbo-blending fbo-blending.c) diff --git a/tests/spec/ext_timer_query/CMakeLists.gl.txt b/tests/spec/ext_timer_query/CMakeLists.gl.txt index 057c25fc..3ac563fc 100644 --- a/tests/spec/ext_timer_query/CMakeLists.gl.txt +++ b/tests/spec/ext_timer_query/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) IF (UNIX) diff --git a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt index 2c984d2f..b8c26937 100644 --- a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt +++ b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (ext_transform_feedback-alignment alignment.c) diff --git a/tests/spec/gl-2.0/CMakeLists.gl.txt b/tests/spec/gl-2.0/CMakeLists.gl.txt index 5ad939ae..6d240035 100644 --- a/tests/spec/gl-2.0/CMakeLists.gl.txt +++ b/tests/spec/gl-2.0/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (vertex-program-two-side vertex-program-two-side.c) diff --git a/tests/spec/gl-2.0/api/CMakeLists.gl.txt b/tests/spec/gl-2.0/api/CMakeLists.gl.txt index b455301d..1d7737ef 100644 --- a/tests/spec/gl-2.0/api/CMakeLists.gl.txt +++ b/tests/spec/gl-2.0/api/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (getattriblocation-conventional getattriblocation-conventional.c) diff --git a/tests/spec/gl-2.1/CMakeLists.gl.txt b/tests/spec/gl-2.1/CMakeLists.gl.txt index f422313b..edf9e715 100644 --- a/tests/spec/gl-2.1/CMakeLists.gl.txt +++ b/tests/spec/gl-2.1/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (gl-2.1-minmax minmax.c) diff --git a/tests/spec/gl-3.0/CMakeLists.gl.txt b/tests/spec/gl-3.0/CMakeLists.gl.txt index 304e4d76..e3dbef1a 100644 --- a/tests/spec/gl-3.0/CMakeLists.gl.txt +++ b/tests/spec/gl-3.0/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (gl-3.0-minmax minmax.c) diff --git a/tests/spec/gl-3.0/api/CMakeLists.gl.txt b/tests/spec/gl-3.0/api/CMakeLists.gl.txt index a945dbbd..924c17e8 100644 --- a/tests/spec/gl-3.0/api/CMakeLists.gl.txt +++ b/tests/spec/gl-3.0/api/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (bindfragdata-invalid-parameters bindfragdata-invalid-parameters.c) diff --git a/tests/spec/gl-3.1/CMakeLists.gl.txt b/tests/spec/gl-3.1/CMakeLists.gl.txt index 608e457c..d30670c0 100644 --- a/tests/spec/gl-3.1/CMakeLists.gl.txt +++ b/tests/spec/gl-3.1/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (gl-3.1-minmax minmax.c) diff --git a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt index 41454d24..9f5d48dc 100644 --- a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -10,7 +9,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (clip-plane-transformation clip-plane-transformation.c) diff --git a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt index 2bac526b..69cdaa20 100644 --- a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (recursion recursion.c) diff --git a/tests/spec/glsl-1.30/CMakeLists.gl.txt b/tests/spec/glsl-1.30/CMakeLists.gl.txt index 3364994f..b45dae9f 100644 --- a/tests/spec/glsl-1.30/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.30/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (glsl-1.30-texel-offset-limits texel-offset-limits.c) diff --git a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt index 8c64778f..fd6691d2 100644 --- a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (fs-discard-exit-2 fs-discard-exit-2.c) diff --git a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt index 00286861..6871f5c5 100644 --- a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -10,7 +9,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (max-clip-distances max-clip-distances.c) diff --git a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt index c4980728..626c632b 100644 --- a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -10,7 +9,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (mixing-clip-distance-and-clip-vertex-disallowed mixing-clip-distance-and-clip-vertex-disallowed.c) diff --git a/tests/spec/glsl-1.40/CMakeLists.gl.txt b/tests/spec/glsl-1.40/CMakeLists.gl.txt index 0d57dbc7..dfa7f020 100644 --- a/tests/spec/glsl-1.40/CMakeLists.gl.txt +++ b/tests/spec/glsl-1.40/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float ${piglit_SOURCE_DIR}/tests/util ) @@ -10,7 +9,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) add_executable (glsl-1.40-tf-no-position tf-no-position.c) diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt index 93aba507..aad93ae4 100644 --- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt +++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) if(BUILD_GLX_TESTS) @@ -14,7 +13,6 @@ endif(BUILD_GLX_TESTS) link_libraries ( ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) IF(BUILD_GLX_TESTS) diff --git a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt index e6941f27..1eaa2ea5 100644 --- a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt +++ b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt @@ -2,7 +2,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) if(BUILD_GLX_TESTS) @@ -14,7 +13,6 @@ endif(BUILD_GLX_TESTS) link_libraries ( ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) IF(BUILD_GLX_TESTS) diff --git a/tests/spec/nv_conditional_render/CMakeLists.gl.txt b/tests/spec/nv_conditional_render/CMakeLists.gl.txt index 670daac6..4e7d4b22 100644 --- a/tests/spec/nv_conditional_render/CMakeLists.gl.txt +++ b/tests/spec/nv_conditional_render/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (nv_conditional_render-begin-while-active begin-while-active.c) diff --git a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt index 1b0394db..98adeb4a 100644 --- a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt +++ b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt @@ -1,14 +1,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (blending-in-shader blending-in-shader.c) diff --git a/tests/texturing/CMakeLists.gl.txt b/tests/texturing/CMakeLists.gl.txt index 37b8bc7c..f4ad8bc4 100644 --- a/tests/texturing/CMakeLists.gl.txt +++ b/tests/texturing/CMakeLists.gl.txt @@ -2,14 +2,12 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (1-1-linear-texture 1-1-linear-texture.c) diff --git a/tests/texturing/shaders/CMakeLists.gl.txt b/tests/texturing/shaders/CMakeLists.gl.txt index ac421dd9..cab42d95 100644 --- a/tests/texturing/shaders/CMakeLists.gl.txt +++ b/tests/texturing/shaders/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ${piglit_SOURCE_DIR}/tests/mesa/util ) @@ -9,7 +8,6 @@ link_libraries ( piglitutil ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} - ${GLUT_glut_LIBRARY} ) piglit_add_executable (textureSize textureSize.c common.c) diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt index 7790e4f4..90c773cf 100644 --- a/tests/util/CMakeLists.gl.txt +++ b/tests/util/CMakeLists.gl.txt @@ -1,7 +1,6 @@ include_directories( ${GLEXT_INCLUDE_DIR} ${OPENGL_INCLUDE_PATH} - ${GLUT_INCLUDE_DIR} ) set(UTIL_SOURCES |