[Piglit] [PATCH 01/17] Remove unnecessary linking with libGLU

Ian Romanick idr at freedesktop.org
Tue Sep 22 08:36:26 PDT 2015


From: Ian Romanick <ian.d.romanick at intel.com>

This patch was created by:

    sed -i -e '/[{]OPENGL_glu_LIBRARY[}]/d' $(grep -lr OPENGL_glu_LIBRARY)
    git checkout tests/glean/CMakeLists.gl.txt
    git checkout tests/spec/gl-1.4/CMakeLists.gl.txt
    git checkout tests/fbo/CMakeLists.gl.txt

So, there are three places out of all of piglit that actually need
this library.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/bugs/CMakeLists.gl.txt                                             | 1 -
 tests/cl/interop/CMakeLists.cl.txt                                       | 1 -
 tests/egl/CMakeLists.gl.txt                                              | 1 -
 tests/fast_color_clear/CMakeLists.gl.txt                                 | 1 -
 tests/general/CMakeLists.gl.txt                                          | 1 -
 tests/glslparsertest/CMakeLists.gl.txt                                   | 1 -
 tests/glx/CMakeLists.gl.txt                                              | 1 -
 tests/hiz/CMakeLists.gl.txt                                              | 1 -
 tests/security/CMakeLists.gl.txt                                         | 1 -
 tests/shaders/CMakeLists.gl.txt                                          | 1 -
 tests/spec/amd_performance_monitor/CMakeLists.gl.txt                     | 1 -
 tests/spec/amd_pinned_memory/CMakeLists.gl.txt                           | 1 -
 tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt            | 1 -
 tests/spec/amd_vertex_shader_layer/CMakeLists.gl.txt                     | 1 -
 tests/spec/amd_vertex_shader_viewport_index/CMakeLists.gl.txt            | 1 -
 tests/spec/arb_base_instance/CMakeLists.gl.txt                           | 1 -
 tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt                 | 1 -
 tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt           | 1 -
 tests/spec/arb_buffer_storage/CMakeLists.gl.txt                          | 1 -
 tests/spec/arb_clip_control/CMakeLists.gl.txt                            | 1 -
 tests/spec/arb_color_buffer_float/CMakeLists.gl.txt                      | 1 -
 tests/spec/arb_compute_shader/CMakeLists.gl.txt                          | 1 -
 tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt                 | 1 -
 tests/spec/arb_copy_buffer/CMakeLists.gl.txt                             | 1 -
 tests/spec/arb_cull_distance/CMakeLists.gl.txt                           | 1 -
 tests/spec/arb_debug_output/CMakeLists.gl.txt                            | 1 -
 tests/spec/arb_depth_clamp/CMakeLists.gl.txt                             | 1 -
 tests/spec/arb_direct_state_access/CMakeLists.gl.txt                     | 1 -
 tests/spec/arb_draw_buffers/CMakeLists.gl.txt                            | 1 -
 tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt               | 1 -
 tests/spec/arb_draw_indirect/CMakeLists.gl.txt                           | 1 -
 tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt                | 1 -
 tests/spec/arb_es2_compatibility/CMakeLists.gl.txt                       | 1 -
 tests/spec/arb_es3_compatibility/CMakeLists.gl.txt                       | 1 -
 tests/spec/arb_explicit_attrib_location/CMakeLists.gl.txt                | 1 -
 tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt               | 1 -
 tests/spec/arb_fragment_program/CMakeLists.gl.txt                        | 1 -
 tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt              | 1 -
 tests/spec/arb_framebuffer_object/CMakeLists.gl.txt                      | 1 -
 tests/spec/arb_framebuffer_srgb/CMakeLists.gl.txt                        | 1 -
 tests/spec/arb_geometry_shader4/execution/CMakeLists.gl.txt              | 1 -
 .../arb_geometry_shader4/execution/program-parameter/CMakeLists.gl.txt   | 1 -
 tests/spec/arb_get_program_binary/CMakeLists.gl.txt                      | 1 -
 tests/spec/arb_get_texture_sub_image/CMakeLists.gl.txt                   | 1 -
 tests/spec/arb_gpu_shader5/CMakeLists.gl.txt                             | 1 -
 tests/spec/arb_gpu_shader5/compiler/CMakeLists.gl.txt                    | 1 -
 tests/spec/arb_gpu_shader5/compiler/stream-qualifier/CMakeLists.gl.txt   | 1 -
 tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt                   | 1 -
 tests/spec/arb_gpu_shader5/linker/CMakeLists.gl.txt                      | 1 -
 tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt                         | 1 -
 tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt               | 1 -
 tests/spec/arb_instanced_arrays/CMakeLists.gl.txt                        | 1 -
 tests/spec/arb_internalformat_query/CMakeLists.gl.txt                    | 1 -
 tests/spec/arb_map_buffer_alignment/CMakeLists.gl.txt                    | 1 -
 tests/spec/arb_map_buffer_range/CMakeLists.gl.txt                        | 1 -
 tests/spec/arb_multisample/CMakeLists.gl.txt                             | 1 -
 tests/spec/arb_occlusion_query/CMakeLists.gl.txt                         | 1 -
 tests/spec/arb_occlusion_query2/CMakeLists.gl.txt                        | 1 -
 tests/spec/arb_program_interface_query/CMakeLists.gl.txt                 | 1 -
 tests/spec/arb_provoking_vertex/CMakeLists.gl.txt                        | 1 -
 tests/spec/arb_robustness/CMakeLists.gl.txt                              | 1 -
 tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt                | 1 -
 tests/spec/arb_sampler_objects/CMakeLists.gl.txt                         | 1 -
 tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt                       | 1 -
 tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt                 | 1 -
 tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt                  | 1 -
 tests/spec/arb_shader_image_load_store/CMakeLists.gl.txt                 | 1 -
 tests/spec/arb_shader_image_size/CMakeLists.gl.txt                       | 1 -
 tests/spec/arb_shader_objects/CMakeLists.gl.txt                          | 1 -
 tests/spec/arb_shader_subroutine/CMakeLists.gl.txt                       | 1 -
 tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt            | 1 -
 tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt      | 1 -
 tests/spec/arb_stencil_texturing/CMakeLists.gl.txt                       | 1 -
 tests/spec/arb_sync/CMakeLists.gl.txt                                    | 1 -
 tests/spec/arb_tessellation_shader/CMakeLists.gl.txt                     | 1 -
 tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt                   | 1 -
 tests/spec/arb_texture_buffer_range/CMakeLists.gl.txt                    | 1 -
 tests/spec/arb_texture_compression/CMakeLists.gl.txt                     | 1 -
 tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt                  | 1 -
 tests/spec/arb_texture_float/CMakeLists.gl.txt                           | 1 -
 tests/spec/arb_texture_multisample/CMakeLists.gl.txt                     | 1 -
 tests/spec/arb_texture_rectangle/CMakeLists.gl.txt                       | 1 -
 tests/spec/arb_texture_stencil8/CMakeLists.gl.txt                        | 1 -
 tests/spec/arb_texture_storage/CMakeLists.gl.txt                         | 1 -
 tests/spec/arb_texture_storage_multisample/CMakeLists.gl.txt             | 1 -
 tests/spec/arb_texture_view/CMakeLists.gl.txt                            | 1 -
 tests/spec/arb_timer_query/CMakeLists.gl.txt                             | 1 -
 tests/spec/arb_transform_feedback2/CMakeLists.gl.txt                     | 1 -
 tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt                   | 1 -
 tests/spec/arb_vertex_array_bgra/CMakeLists.gl.txt                       | 1 -
 tests/spec/arb_vertex_attrib_64bit/execution/CMakeLists.gl.txt           | 1 -
 tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt                    | 1 -
 tests/spec/arb_vertex_program/CMakeLists.gl.txt                          | 1 -
 tests/spec/arb_vertex_type_10f_11f_11f_rev/CMakeLists.gl.txt             | 1 -
 tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt              | 1 -
 tests/spec/arb_viewport_array/CMakeLists.gl.txt                          | 1 -
 tests/spec/ati_draw_buffers/CMakeLists.gl.txt                            | 1 -
 tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt                          | 1 -
 tests/spec/ext_depth_bounds_test/CMakeLists.gl.txt                       | 1 -
 tests/spec/ext_fog_coord/CMakeLists.gl.txt                               | 1 -
 tests/spec/ext_framebuffer_blit/CMakeLists.gl.txt                        | 1 -
 tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt                 | 1 -
 tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt     | 1 -
 tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt                    | 1 -
 tests/spec/ext_packed_float/CMakeLists.gl.txt                            | 1 -
 tests/spec/ext_texture_array/CMakeLists.gl.txt                           | 1 -
 tests/spec/ext_texture_integer/CMakeLists.gl.txt                         | 1 -
 tests/spec/ext_texture_swizzle/CMakeLists.gl.txt                         | 1 -
 tests/spec/ext_timer_query/CMakeLists.gl.txt                             | 1 -
 tests/spec/ext_transform_feedback/CMakeLists.gl.txt                      | 1 -
 tests/spec/gl-1.0/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gl-1.5/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gl-2.0/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gl-2.0/api/CMakeLists.gl.txt                                  | 1 -
 tests/spec/gl-2.1/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gl-3.0/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gl-3.0/api/CMakeLists.gl.txt                                  | 1 -
 tests/spec/gl-3.1/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gl-3.2/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt                    | 1 -
 tests/spec/gl-3.3/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gl-4.4/CMakeLists.gl.txt                                      | 1 -
 tests/spec/gles-3.0/CMakeLists.gl.txt                                    | 1 -
 tests/spec/glsl-1.10/execution/CMakeLists.gl.txt                         | 1 -
 tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt                | 1 -
 tests/spec/glsl-1.10/execution/varying-packing/CMakeLists.gl.txt         | 1 -
 tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt                         | 1 -
 tests/spec/glsl-1.30/CMakeLists.gl.txt                                   | 1 -
 tests/spec/glsl-1.30/execution/CMakeLists.gl.txt                         | 1 -
 tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt                | 1 -
 tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt                   | 1 -
 tests/spec/glsl-1.40/CMakeLists.gl.txt                                   | 1 -
 tests/spec/glsl-1.50/CMakeLists.gl.txt                                   | 1 -
 tests/spec/glsl-1.50/execution/CMakeLists.gl.txt                         | 1 -
 tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt                | 1 -
 tests/spec/glx_arb_create_context/CMakeLists.gl.txt                      | 1 -
 tests/spec/glx_ext_import_context/CMakeLists.gl.txt                      | 1 -
 tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt                     | 1 -
 tests/spec/glx_oml_sync_control/CMakeLists.gl.txt                        | 1 -
 tests/spec/khr_debug/CMakeLists.gl.txt                                   | 1 -
 tests/spec/mesa_pack_invert/CMakeLists.gl.txt                            | 1 -
 tests/spec/nv_conditional_render/CMakeLists.gl.txt                       | 1 -
 tests/spec/nv_texture_barrier/CMakeLists.gl.txt                          | 1 -
 tests/texturing/CMakeLists.gl.txt                                        | 1 -
 tests/texturing/shaders/CMakeLists.gl.txt                                | 1 -
 145 files changed, 145 deletions(-)

diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index e24ec6b..65a11f2 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (crash-cubemap-order crash-cubemap-order.c)
diff --git a/tests/cl/interop/CMakeLists.cl.txt b/tests/cl/interop/CMakeLists.cl.txt
index d8dc73a..557563c 100644
--- a/tests/cl/interop/CMakeLists.cl.txt
+++ b/tests/cl/interop/CMakeLists.cl.txt
@@ -8,7 +8,6 @@ IF(EGL_FOUND AND PIGLIT_BUILD_GLES2_TESTS)
 		piglitutil_gles2
 		${EGL_LDFLAGS}
 		${OPENGL_gl_LIBRARY}
-		${OPENGL_glu_LIBRARY}
 	)
 
 	piglit_cl_add_interop_test (egl_khr_cl_event2 egl_khr_cl_event2.c)
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
index 34fee6e..eccd470 100644
--- a/tests/egl/CMakeLists.gl.txt
+++ b/tests/egl/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ link_libraries (
 	piglitutil_${piglit_target_api}
 	${EGL_LDFLAGS}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
diff --git a/tests/fast_color_clear/CMakeLists.gl.txt b/tests/fast_color_clear/CMakeLists.gl.txt
index d1c8770..3040eb4 100644
--- a/tests/fast_color_clear/CMakeLists.gl.txt
+++ b/tests/fast_color_clear/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (fcc-read-after-clear read-after-clear.c)
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index f773855..298f59c 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 if(NOT PIGLIT_USE_WAFFLE)
diff --git a/tests/glslparsertest/CMakeLists.gl.txt b/tests/glslparsertest/CMakeLists.gl.txt
index 3355524..1863b7b 100644
--- a/tests/glslparsertest/CMakeLists.gl.txt
+++ b/tests/glslparsertest/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries(
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 	)
 
 piglit_add_executable (glslparsertest glslparsertest.c)
diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
index 7c533c6..ff13f0b 100644
--- a/tests/glx/CMakeLists.gl.txt
+++ b/tests/glx/CMakeLists.gl.txt
@@ -12,7 +12,6 @@ endif(PIGLIT_BUILD_GLX_TESTS)
 
 link_libraries (
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 IF(PIGLIT_BUILD_GLX_TESTS)
diff --git a/tests/hiz/CMakeLists.gl.txt b/tests/hiz/CMakeLists.gl.txt
index d1615fc..f69f38c 100644
--- a/tests/hiz/CMakeLists.gl.txt
+++ b/tests/hiz/CMakeLists.gl.txt
@@ -17,7 +17,6 @@ link_libraries (
 	hiz-util
 
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable(hiz-depth-stencil-test-fbo-d0-s8 hiz-depth-stencil-test-fbo-d0-s8.c)
diff --git a/tests/security/CMakeLists.gl.txt b/tests/security/CMakeLists.gl.txt
index 29f36b1..11a4644 100644
--- a/tests/security/CMakeLists.gl.txt
+++ b/tests/security/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 12e400d..abbe14c 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (glsl-max-vertex-attrib glsl-max-vertex-attrib.c)
diff --git a/tests/spec/amd_performance_monitor/CMakeLists.gl.txt b/tests/spec/amd_performance_monitor/CMakeLists.gl.txt
index 5ddc12d..ac29de7 100644
--- a/tests/spec/amd_performance_monitor/CMakeLists.gl.txt
+++ b/tests/spec/amd_performance_monitor/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (amd_performance_monitor_api api.c)
diff --git a/tests/spec/amd_pinned_memory/CMakeLists.gl.txt b/tests/spec/amd_pinned_memory/CMakeLists.gl.txt
index f404da6..72627ff 100644
--- a/tests/spec/amd_pinned_memory/CMakeLists.gl.txt
+++ b/tests/spec/amd_pinned_memory/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (amd_pinned_memory test.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 666f999..8c47fd6 100644
--- a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
+++ b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (amd_seamless_cubemap_per_texture amd_seamless_cubemap_per_texture.c)
diff --git a/tests/spec/amd_vertex_shader_layer/CMakeLists.gl.txt b/tests/spec/amd_vertex_shader_layer/CMakeLists.gl.txt
index 6f64d94..5bc5d28 100644
--- a/tests/spec/amd_vertex_shader_layer/CMakeLists.gl.txt
+++ b/tests/spec/amd_vertex_shader_layer/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (amd_vertex_shader_layer-layered-2d-texture-render layered-2d-texture-render.c)
diff --git a/tests/spec/amd_vertex_shader_viewport_index/CMakeLists.gl.txt b/tests/spec/amd_vertex_shader_viewport_index/CMakeLists.gl.txt
index a3da135..e332723 100644
--- a/tests/spec/amd_vertex_shader_viewport_index/CMakeLists.gl.txt
+++ b/tests/spec/amd_vertex_shader_viewport_index/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (amd_vertex_shader_viewport_index-render render.c)
diff --git a/tests/spec/arb_base_instance/CMakeLists.gl.txt b/tests/spec/arb_base_instance/CMakeLists.gl.txt
index 0982d15..b1e2eb6 100644
--- a/tests/spec/arb_base_instance/CMakeLists.gl.txt
+++ b/tests/spec/arb_base_instance/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories (
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_base_instance-baseinstance-doesnt-affect-gl-instance-id baseinstance-doesnt-affect-gl-instance-id.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 8902d45..6d2ae54 100644
--- a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
+++ b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 1db7fa1..f48c352 100644
--- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_blend_func_extended-fbo-extended-blend fbo-extended-blend.c)
diff --git a/tests/spec/arb_buffer_storage/CMakeLists.gl.txt b/tests/spec/arb_buffer_storage/CMakeLists.gl.txt
index 9579cce..3209c7c 100644
--- a/tests/spec/arb_buffer_storage/CMakeLists.gl.txt
+++ b/tests/spec/arb_buffer_storage/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (bufferstorage-persistent bufferstorage.c)
diff --git a/tests/spec/arb_clip_control/CMakeLists.gl.txt b/tests/spec/arb_clip_control/CMakeLists.gl.txt
index 3951bfb..4a9f7ee 100644
--- a/tests/spec/arb_clip_control/CMakeLists.gl.txt
+++ b/tests/spec/arb_clip_control/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (clip-control clip-control.c)
diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
index 6c3b87c..62e44db 100644
--- a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_color_buffer_float-getteximage getteximage.c)
diff --git a/tests/spec/arb_compute_shader/CMakeLists.gl.txt b/tests/spec/arb_compute_shader/CMakeLists.gl.txt
index a3367a7..0eccf06 100644
--- a/tests/spec/arb_compute_shader/CMakeLists.gl.txt
+++ b/tests/spec/arb_compute_shader/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_compute_shader-api_errors api_errors.c)
diff --git a/tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt b/tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt
index 22a7162..b58f522 100644
--- a/tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt
+++ b/tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_compute_shader-work_group_size_too_large work_group_size_too_large.c)
diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
index 6e5695e..3feaca8 100644
--- a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
+++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (copy_buffer_coherency copy_buffer_coherency.c)
diff --git a/tests/spec/arb_cull_distance/CMakeLists.gl.txt b/tests/spec/arb_cull_distance/CMakeLists.gl.txt
index 431c192..0a2d4a2 100644
--- a/tests/spec/arb_cull_distance/CMakeLists.gl.txt
+++ b/tests/spec/arb_cull_distance/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_cull_distance-max-distances max-distances.c)
diff --git a/tests/spec/arb_debug_output/CMakeLists.gl.txt b/tests/spec/arb_debug_output/CMakeLists.gl.txt
index de10d72..7f510be 100644
--- a/tests/spec/arb_debug_output/CMakeLists.gl.txt
+++ b/tests/spec/arb_debug_output/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_debug_output-api_error api_error.c)
diff --git a/tests/spec/arb_depth_clamp/CMakeLists.gl.txt b/tests/spec/arb_depth_clamp/CMakeLists.gl.txt
index d6283b0..806d17f 100644
--- a/tests/spec/arb_depth_clamp/CMakeLists.gl.txt
+++ b/tests/spec/arb_depth_clamp/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (depth-clamp-status depth-clamp-status.c)
diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
index d078aa0..4819f10 100644
--- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
+++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_direct_state_access-bind-texture-unit bind-texture-unit.c)
diff --git a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
index 88af1f3..64818cc 100644
--- a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 022e7f1..8c39c4d 100644
--- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_draw_elements_base_vertex-bounds bounds.c)
diff --git a/tests/spec/arb_draw_indirect/CMakeLists.gl.txt b/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
index 1d1b598..471b675 100644
--- a/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_indirect/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_draw_indirect-api-errors api-errors.c)
diff --git a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
index 4228092..a3a1010 100644
--- a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 99937fa..974f232 100644
--- a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
+++ b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_es2_compatibility-depthrangef arb_es2_compatibility-depthrangef.c)
diff --git a/tests/spec/arb_es3_compatibility/CMakeLists.gl.txt b/tests/spec/arb_es3_compatibility/CMakeLists.gl.txt
index 8f70460..e526d53 100644
--- a/tests/spec/arb_es3_compatibility/CMakeLists.gl.txt
+++ b/tests/spec/arb_es3_compatibility/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (es3-primrestart-fixedindex es3-primrestart-fixedindex.c)
diff --git a/tests/spec/arb_explicit_attrib_location/CMakeLists.gl.txt b/tests/spec/arb_explicit_attrib_location/CMakeLists.gl.txt
index 9f8f4ad..24d0965 100644
--- a/tests/spec/arb_explicit_attrib_location/CMakeLists.gl.txt
+++ b/tests/spec/arb_explicit_attrib_location/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (overlapping-locations-input-attribs overlapping-locations-input-attribs.c)
diff --git a/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt b/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt
index 8ba0ab6..35d5b52 100644
--- a/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt
+++ b/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
        piglitutil_${piglit_target_api}
        ${OPENGL_gl_LIBRARY}
-       ${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_explicit_uniform_location-minmax minmax.c)
diff --git a/tests/spec/arb_fragment_program/CMakeLists.gl.txt b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
index 0b63ada..47eb32b 100644
--- a/tests/spec/arb_fragment_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_fragment_program-minmax minmax.c)
diff --git a/tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt b/tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt
index 311d62f..3b0cb5e 100755
--- a/tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt
+++ b/tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
        piglitutil_${piglit_target_api}
        ${OPENGL_gl_LIBRARY}
-       ${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_framebuffer_no_attachments-minmax minmax.c)
diff --git a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
index e2cb8c2..06d5978 100644
--- a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable(framebuffer-blit-levels framebuffer-blit-levels.c)
diff --git a/tests/spec/arb_framebuffer_srgb/CMakeLists.gl.txt b/tests/spec/arb_framebuffer_srgb/CMakeLists.gl.txt
index a0f0ad7..04609b8 100644
--- a/tests/spec/arb_framebuffer_srgb/CMakeLists.gl.txt
+++ b/tests/spec/arb_framebuffer_srgb/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_framebuffer_srgb-pushpop pushpop.c)
diff --git a/tests/spec/arb_geometry_shader4/execution/CMakeLists.gl.txt b/tests/spec/arb_geometry_shader4/execution/CMakeLists.gl.txt
index 292ae8f..b18bbb5 100644
--- a/tests/spec/arb_geometry_shader4/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_geometry_shader4/execution/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_geometry_shader4-ignore-adjacent-vertices ignore-adjacent-vertices.c)
diff --git a/tests/spec/arb_geometry_shader4/execution/program-parameter/CMakeLists.gl.txt b/tests/spec/arb_geometry_shader4/execution/program-parameter/CMakeLists.gl.txt
index bfe94cf..a527b7b 100644
--- a/tests/spec/arb_geometry_shader4/execution/program-parameter/CMakeLists.gl.txt
+++ b/tests/spec/arb_geometry_shader4/execution/program-parameter/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_geometry_shader4-program-parameter-input-type input-type.c)
diff --git a/tests/spec/arb_get_program_binary/CMakeLists.gl.txt b/tests/spec/arb_get_program_binary/CMakeLists.gl.txt
index 3917d05..9e71ce0 100644
--- a/tests/spec/arb_get_program_binary/CMakeLists.gl.txt
+++ b/tests/spec/arb_get_program_binary/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_get_program_binary-api-errors api-errors.c)
diff --git a/tests/spec/arb_get_texture_sub_image/CMakeLists.gl.txt b/tests/spec/arb_get_texture_sub_image/CMakeLists.gl.txt
index 2194f8c..1b07174 100644
--- a/tests/spec/arb_get_texture_sub_image/CMakeLists.gl.txt
+++ b/tests/spec/arb_get_texture_sub_image/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_get_texture_sub_image-cubemap cubemap.c)
diff --git a/tests/spec/arb_gpu_shader5/CMakeLists.gl.txt b/tests/spec/arb_gpu_shader5/CMakeLists.gl.txt
index 7e534f2..33374e8 100644
--- a/tests/spec/arb_gpu_shader5/CMakeLists.gl.txt
+++ b/tests/spec/arb_gpu_shader5/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_gpu_shader5-minmax minmax.c)
diff --git a/tests/spec/arb_gpu_shader5/compiler/CMakeLists.gl.txt b/tests/spec/arb_gpu_shader5/compiler/CMakeLists.gl.txt
index 2940b90..027b75f 100644
--- a/tests/spec/arb_gpu_shader5/compiler/CMakeLists.gl.txt
+++ b/tests/spec/arb_gpu_shader5/compiler/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_gpu_shader5-invocations_count_too_large invocations_count_too_large.c)
diff --git a/tests/spec/arb_gpu_shader5/compiler/stream-qualifier/CMakeLists.gl.txt b/tests/spec/arb_gpu_shader5/compiler/stream-qualifier/CMakeLists.gl.txt
index 11b3110..f438659 100644
--- a/tests/spec/arb_gpu_shader5/compiler/stream-qualifier/CMakeLists.gl.txt
+++ b/tests/spec/arb_gpu_shader5/compiler/stream-qualifier/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_gpu_shader5-stream_value_too_large stream_value_too_large.c)
diff --git a/tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt b/tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt
index 0b743d9..1de5cf7 100644
--- a/tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_gpu_shader5/execution/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_gpu_shader5-invocation-id invocation-id.c)
diff --git a/tests/spec/arb_gpu_shader5/linker/CMakeLists.gl.txt b/tests/spec/arb_gpu_shader5/linker/CMakeLists.gl.txt
index f955e83..e0481b5 100644
--- a/tests/spec/arb_gpu_shader5/linker/CMakeLists.gl.txt
+++ b/tests/spec/arb_gpu_shader5/linker/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_gpu_shader5-emitstreamvertex_stream_too_large emitstreamvertex_stream_too_large.c)
diff --git a/tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt b/tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt
index 03d2273..84601b7 100644
--- a/tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt
+++ b/tests/spec/arb_gpu_shader_fp64/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
        piglitutil_${piglit_target_api}
        ${OPENGL_gl_LIBRARY}
-       ${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_gpu_shader_fp64-double_in_bool_uniform double_in_bool_uniform.c)
diff --git a/tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt b/tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt
index 650b312..ffb3da5 100644
--- a/tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_gpu_shader_fp64/execution/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_gpu_shader_fp64-tf-separate tf-separate.c)
diff --git a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
index 1ae1112..b135050 100644
--- a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
+++ b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_instanced_arrays-instanced_arrays instanced_arrays.c)
diff --git a/tests/spec/arb_internalformat_query/CMakeLists.gl.txt b/tests/spec/arb_internalformat_query/CMakeLists.gl.txt
index 50a26b1..6daed74 100644
--- a/tests/spec/arb_internalformat_query/CMakeLists.gl.txt
+++ b/tests/spec/arb_internalformat_query/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_internalformat_query-api-errors api-errors.c)
diff --git a/tests/spec/arb_map_buffer_alignment/CMakeLists.gl.txt b/tests/spec/arb_map_buffer_alignment/CMakeLists.gl.txt
index 4cb3148..9222610 100644
--- a/tests/spec/arb_map_buffer_alignment/CMakeLists.gl.txt
+++ b/tests/spec/arb_map_buffer_alignment/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_map_buffer_alignment-map-invalidate-range map-invalidate-range.c)
diff --git a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
index df8570e..29a8f96 100644
--- a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
+++ b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 79735d8..bc268c4 100644
--- a/tests/spec/arb_multisample/CMakeLists.gl.txt
+++ b/tests/spec/arb_multisample/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_multisample-beginend beginend.c)
diff --git a/tests/spec/arb_occlusion_query/CMakeLists.gl.txt b/tests/spec/arb_occlusion_query/CMakeLists.gl.txt
index 025c2cd..78f92ed 100644
--- a/tests/spec/arb_occlusion_query/CMakeLists.gl.txt
+++ b/tests/spec/arb_occlusion_query/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (occlusion_query occlusion_query.c)
diff --git a/tests/spec/arb_occlusion_query2/CMakeLists.gl.txt b/tests/spec/arb_occlusion_query2/CMakeLists.gl.txt
index f1cee6f..fc3bd08 100644
--- a/tests/spec/arb_occlusion_query2/CMakeLists.gl.txt
+++ b/tests/spec/arb_occlusion_query2/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_occlusion_query2-api api.c)
diff --git a/tests/spec/arb_program_interface_query/CMakeLists.gl.txt b/tests/spec/arb_program_interface_query/CMakeLists.gl.txt
index 91da8ac..f976f3c 100755
--- a/tests/spec/arb_program_interface_query/CMakeLists.gl.txt
+++ b/tests/spec/arb_program_interface_query/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
        piglitutil_${piglit_target_api}
        ${OPENGL_gl_LIBRARY}
-       ${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_program_interface_query-resource-location resource-location.c)
diff --git a/tests/spec/arb_provoking_vertex/CMakeLists.gl.txt b/tests/spec/arb_provoking_vertex/CMakeLists.gl.txt
index 01db2d9..6dd15bb 100644
--- a/tests/spec/arb_provoking_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_provoking_vertex/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb-provoking-vertex-control provoking-vertex-control.c)
diff --git a/tests/spec/arb_robustness/CMakeLists.gl.txt b/tests/spec/arb_robustness/CMakeLists.gl.txt
index cfec145..641dbad 100644
--- a/tests/spec/arb_robustness/CMakeLists.gl.txt
+++ b/tests/spec/arb_robustness/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_robustness_draw-vbo-bounds draw-vbo-bounds.c)
diff --git a/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt b/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt
index ede97f7..3752da7 100644
--- a/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_sample_shading/execution/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_sample_shading-api api.c)
diff --git a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
index 23070a3..df1a6bb 100644
--- a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_sampler_objects-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 e31759a..3040239 100644
--- a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
+++ b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_seamless_cubemap arb_seamless_cubemap.c)
diff --git a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt
index abd6b37..c2b0ead 100644
--- a/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_separate_shader_objects/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_separate_shader_object-400-combinations 400-combinations.c)
diff --git a/tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt b/tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt
index 386b794..40ea057 100644
--- a/tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_shader_atomic_counters-active-counters active-counters.c common.c)
diff --git a/tests/spec/arb_shader_image_load_store/CMakeLists.gl.txt b/tests/spec/arb_shader_image_load_store/CMakeLists.gl.txt
index 9db9d18..7cda809 100644
--- a/tests/spec/arb_shader_image_load_store/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_image_load_store/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 set(depends image.c grid.c common.c)
diff --git a/tests/spec/arb_shader_image_size/CMakeLists.gl.txt b/tests/spec/arb_shader_image_size/CMakeLists.gl.txt
index 03de9b0..88d2359 100755
--- a/tests/spec/arb_shader_image_size/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_image_size/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_shader_image_size-builtin builtin.c
diff --git a/tests/spec/arb_shader_objects/CMakeLists.gl.txt b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
index 34a6899..b3bc22b 100644
--- a/tests/spec/arb_shader_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_shader_objects-bindattriblocation-scratch-name bindattriblocation-scratch-name.c)
diff --git a/tests/spec/arb_shader_subroutine/CMakeLists.gl.txt b/tests/spec/arb_shader_subroutine/CMakeLists.gl.txt
index 8e6bd58..87a3406 100644
--- a/tests/spec/arb_shader_subroutine/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_subroutine/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_shader_subroutine-minmax minmax.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 2366fa9..87e5b97 100644
--- a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_shader_texture_lod-texgrad texgrad.c)
diff --git a/tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt b/tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt
index a189afc..73d0e82 100644
--- a/tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_shading_language_420pack-binding-layout binding-layout.c)
diff --git a/tests/spec/arb_stencil_texturing/CMakeLists.gl.txt b/tests/spec/arb_stencil_texturing/CMakeLists.gl.txt
index d49656a..cb469b7 100644
--- a/tests/spec/arb_stencil_texturing/CMakeLists.gl.txt
+++ b/tests/spec/arb_stencil_texturing/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_stencil_texturing-draw draw.c)
diff --git a/tests/spec/arb_sync/CMakeLists.gl.txt b/tests/spec/arb_sync/CMakeLists.gl.txt
index 0a55eef..b8bf352 100644
--- a/tests/spec/arb_sync/CMakeLists.gl.txt
+++ b/tests/spec/arb_sync/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_sync-client-wait-errors ClientWaitSync-errors.c)
diff --git a/tests/spec/arb_tessellation_shader/CMakeLists.gl.txt b/tests/spec/arb_tessellation_shader/CMakeLists.gl.txt
index dd4cbc1..c87e0d5 100644
--- a/tests/spec/arb_tessellation_shader/CMakeLists.gl.txt
+++ b/tests/spec/arb_tessellation_shader/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_tessellation_shader-get-tcs-params get-tcs-params.c)
diff --git a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
index 5019e52..fba4793 100644
--- a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_buffer_object-data-sync data-sync.c)
diff --git a/tests/spec/arb_texture_buffer_range/CMakeLists.gl.txt b/tests/spec/arb_texture_buffer_range/CMakeLists.gl.txt
index 8ab1abc..a0c3cc4 100644
--- a/tests/spec/arb_texture_buffer_range/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_buffer_range/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_buffer_range-dlist dlist.c)
diff --git a/tests/spec/arb_texture_compression/CMakeLists.gl.txt b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
index 03d5f89..02acf79 100644
--- a/tests/spec/arb_texture_compression/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_compression-internal-format-query internal-format-query.c)
diff --git a/tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt b/tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt
index deccbfa..cf6332b 100644
--- a/tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_cube_map_array/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_cube_map_array-cubemap cubemap.c)
diff --git a/tests/spec/arb_texture_float/CMakeLists.gl.txt b/tests/spec/arb_texture_float/CMakeLists.gl.txt
index 4eb9312..80090b0 100644
--- a/tests/spec/arb_texture_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_float/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_float-texture-float-formats texture-float-formats.c)
diff --git a/tests/spec/arb_texture_multisample/CMakeLists.gl.txt b/tests/spec/arb_texture_multisample/CMakeLists.gl.txt
index 1872bfe..ae7fc34 100644
--- a/tests/spec/arb_texture_multisample/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_multisample/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_multisample-minmax minmax.c)
diff --git a/tests/spec/arb_texture_rectangle/CMakeLists.gl.txt b/tests/spec/arb_texture_rectangle/CMakeLists.gl.txt
index 96f04e2..3f67b81 100644
--- a/tests/spec/arb_texture_rectangle/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_rectangle/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (texrect_simple_arb_texrect texrect-simple.c)
diff --git a/tests/spec/arb_texture_stencil8/CMakeLists.gl.txt b/tests/spec/arb_texture_stencil8/CMakeLists.gl.txt
index a8d1693..d8de83c 100644
--- a/tests/spec/arb_texture_stencil8/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_stencil8/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_stencil8-stencil-texture stencil-texture.c)
diff --git a/tests/spec/arb_texture_storage/CMakeLists.gl.txt b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
index 2ab19df..e387782 100644
--- a/tests/spec/arb_texture_storage/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_storage-texture-storage texture-storage.c)
diff --git a/tests/spec/arb_texture_storage_multisample/CMakeLists.gl.txt b/tests/spec/arb_texture_storage_multisample/CMakeLists.gl.txt
index 69b00cf..8f3780e 100644
--- a/tests/spec/arb_texture_storage_multisample/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_storage_multisample/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_texture_storage_multisample-tex-storage tex-storage.c)
diff --git a/tests/spec/arb_texture_view/CMakeLists.gl.txt b/tests/spec/arb_texture_view/CMakeLists.gl.txt
index 19994a6..197731a 100644
--- a/tests/spec/arb_texture_view/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_view/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries(
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 	)
 
 piglit_add_executable(arb_texture_view-clear-into-view-2d-array clear-into-view-2d-array.c common.c)
diff --git a/tests/spec/arb_timer_query/CMakeLists.gl.txt b/tests/spec/arb_timer_query/CMakeLists.gl.txt
index 0913aae..e187735 100644
--- a/tests/spec/arb_timer_query/CMakeLists.gl.txt
+++ b/tests/spec/arb_timer_query/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_timer_query-timestamp-get timestamp-get.c)
diff --git a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
index c6287a1..03635c0 100644
--- a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
+++ b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_transform_feedback2-api-queries api-queries.c)
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index cefddb0..2f66fc0 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_uniform_buffer_object-bindbuffer-general-point bindbuffer-general-point.c)
diff --git a/tests/spec/arb_vertex_array_bgra/CMakeLists.gl.txt b/tests/spec/arb_vertex_array_bgra/CMakeLists.gl.txt
index 4ae8eca..21c9065 100644
--- a/tests/spec/arb_vertex_array_bgra/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_array_bgra/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_vertex_array_bgra-api-errors api-errors.c)
diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/CMakeLists.gl.txt b/tests/spec/arb_vertex_attrib_64bit/execution/CMakeLists.gl.txt
index bb9cb8c..3c9a980 100644
--- a/tests/spec/arb_vertex_attrib_64bit/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_attrib_64bit/execution/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_vertex_attrib_64bit-double_attribs double_attribs.c)
diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
index 6baaa19..e1d91f1 100644
--- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 197b20e..14c0857 100644
--- a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_vertex_program-getenv4d-with-error getenv4d-with-error.c)
diff --git a/tests/spec/arb_vertex_type_10f_11f_11f_rev/CMakeLists.gl.txt b/tests/spec/arb_vertex_type_10f_11f_11f_rev/CMakeLists.gl.txt
index 1c751bf..60203d2 100644
--- a/tests/spec/arb_vertex_type_10f_11f_11f_rev/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_type_10f_11f_11f_rev/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (arb_vertex_type_10f_11f_11f_rev-api-errors api-errors.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 9240d2d..3ddca75 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
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (draw-vertices-2101010 draw-vertices-2101010.c)
diff --git a/tests/spec/arb_viewport_array/CMakeLists.gl.txt b/tests/spec/arb_viewport_array/CMakeLists.gl.txt
index 485334d..3b8124f 100644
--- a/tests/spec/arb_viewport_array/CMakeLists.gl.txt
+++ b/tests/spec/arb_viewport_array/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries(
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 	)
 
 piglit_add_executable(arb_viewport_array-clear clear.c)
diff --git a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
index 9d24720..7d98f9f 100644
--- a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 2e013a2..62142f9 100644
--- a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
+++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ati_envmap_bumpmap-bump bump.c)
diff --git a/tests/spec/ext_depth_bounds_test/CMakeLists.gl.txt b/tests/spec/ext_depth_bounds_test/CMakeLists.gl.txt
index 7879390..b8f8878 100644
--- a/tests/spec/ext_depth_bounds_test/CMakeLists.gl.txt
+++ b/tests/spec/ext_depth_bounds_test/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (depth_bounds depth_bounds.c)
diff --git a/tests/spec/ext_fog_coord/CMakeLists.gl.txt b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
index eeee539..9ab4bf0 100644
--- a/tests/spec/ext_fog_coord/CMakeLists.gl.txt
+++ b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_fog_coord-modes modes.c)
diff --git a/tests/spec/ext_framebuffer_blit/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_blit/CMakeLists.gl.txt
index e0a5f5b..683ba39 100644
--- a/tests/spec/ext_framebuffer_blit/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_blit/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_framebuffer_blit-blit-early blit-early.c)
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index d16762e..1733f57 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_framebuffer_multisample-accuracy common.cpp accuracy.cpp)
diff --git a/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt
index fd3e72f..7bd40c2 100644
--- a/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample_blit_scaled/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_framebuffer_multisample_blit_scaled-blit-scaled blit-scaled.cpp)
diff --git a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
index f9df631..9cb3791 100644
--- a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_packed_depth_stencil-depth-stencil-texture depth-stencil-texture.c)
diff --git a/tests/spec/ext_packed_float/CMakeLists.gl.txt b/tests/spec/ext_packed_float/CMakeLists.gl.txt
index db21d7c..44a8818 100644
--- a/tests/spec/ext_packed_float/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_float/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 3ec3ec4..810e22b 100644
--- a/tests/spec/ext_texture_array/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_array/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_texture_array-errors errors.c)
diff --git a/tests/spec/ext_texture_integer/CMakeLists.gl.txt b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
index 2932bc2..e57938a 100644
--- a/tests/spec/ext_texture_integer/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_texture_integer-fbo-blending fbo-blending.c)
diff --git a/tests/spec/ext_texture_swizzle/CMakeLists.gl.txt b/tests/spec/ext_texture_swizzle/CMakeLists.gl.txt
index 98533b2..3aa6ef9 100644
--- a/tests/spec/ext_texture_swizzle/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_swizzle/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (depth_texture_mode_and_swizzle depth_texture_mode_and_swizzle.c)
diff --git a/tests/spec/ext_timer_query/CMakeLists.gl.txt b/tests/spec/ext_timer_query/CMakeLists.gl.txt
index 52f7fb2..77ffb08 100644
--- a/tests/spec/ext_timer_query/CMakeLists.gl.txt
+++ b/tests/spec/ext_timer_query/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_timer_query-time-elapsed time-elapsed.c)
diff --git a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
index 755a893..289f860 100644
--- a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
+++ b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (ext_transform_feedback-alignment alignment.c)
diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt b/tests/spec/gl-1.0/CMakeLists.gl.txt
index 7a7f508..e65e757 100644
--- a/tests/spec/gl-1.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-1.0/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-1.0-beginend-coverage beginend-coverage.c)
diff --git a/tests/spec/gl-1.5/CMakeLists.gl.txt b/tests/spec/gl-1.5/CMakeLists.gl.txt
index f10c6cb..e072757 100644
--- a/tests/spec/gl-1.5/CMakeLists.gl.txt
+++ b/tests/spec/gl-1.5/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-1.5-normal3b3s-invariance normal3b3s-invariance.c)
diff --git a/tests/spec/gl-2.0/CMakeLists.gl.txt b/tests/spec/gl-2.0/CMakeLists.gl.txt
index 9461a03..e10940b 100644
--- a/tests/spec/gl-2.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 9968b13..fe59747 100644
--- a/tests/spec/gl-2.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-2.0-active-sampler-conflict active-sampler-conflict.c)
diff --git a/tests/spec/gl-2.1/CMakeLists.gl.txt b/tests/spec/gl-2.1/CMakeLists.gl.txt
index f395e32..dc7b3ed 100644
--- a/tests/spec/gl-2.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.1/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 c3e6a28..9dc732b 100644
--- a/tests/spec/gl-3.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-3.0-bound-resource-limits bound-resource-limits.c)
diff --git a/tests/spec/gl-3.0/api/CMakeLists.gl.txt b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
index ebe73ac..2df3eaf 100644
--- a/tests/spec/gl-3.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 a5f28c1..0a1a97c 100644
--- a/tests/spec/gl-3.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.1/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-3.1-default-vao default-vao.c)
diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt b/tests/spec/gl-3.2/CMakeLists.gl.txt
index 0ffa7fc..c1c7811 100644
--- a/tests/spec/gl-3.2/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.2/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-3.2-minmax minmax.c)
diff --git a/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt b/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt
index a5628dc..ac16f85 100644
--- a/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-3.2-layered-rendering-blit blit.c)
diff --git a/tests/spec/gl-3.3/CMakeLists.gl.txt b/tests/spec/gl-3.3/CMakeLists.gl.txt
index b58b541..9c6e4c8 100644
--- a/tests/spec/gl-3.3/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.3/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-3.3-minmax minmax.c)
diff --git a/tests/spec/gl-4.4/CMakeLists.gl.txt b/tests/spec/gl-4.4/CMakeLists.gl.txt
index 3287f85..2597846 100644
--- a/tests/spec/gl-4.4/CMakeLists.gl.txt
+++ b/tests/spec/gl-4.4/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (gl-4.4-max_vertex_attrib_stride gl_max_vertex_attrib_stride.c)
diff --git a/tests/spec/gles-3.0/CMakeLists.gl.txt b/tests/spec/gles-3.0/CMakeLists.gl.txt
index 6c24a81..38ba216 100644
--- a/tests/spec/gles-3.0/CMakeLists.gl.txt
+++ b/tests/spec/gles-3.0/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable(oes_compressed_etc2_texture-miptree oes_compressed_etc2_texture-miptree.c)
diff --git a/tests/spec/glsl-1.10/execution/CMakeLists.gl.txt b/tests/spec/glsl-1.10/execution/CMakeLists.gl.txt
index 0ddc221..7760662 100644
--- a/tests/spec/glsl-1.10/execution/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.10/execution/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (glsl-render-after-bad-attach glsl-render-after-bad-attach.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 ca7a444..bad4f98 100644
--- a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (clip-plane-transformation clip-plane-transformation.c)
diff --git a/tests/spec/glsl-1.10/execution/varying-packing/CMakeLists.gl.txt b/tests/spec/glsl-1.10/execution/varying-packing/CMakeLists.gl.txt
index 692b5e7..57035c4 100644
--- a/tests/spec/glsl-1.10/execution/varying-packing/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.10/execution/varying-packing/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (varying-packing-simple simple.c)
diff --git a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
index ff5685f..ccf674f 100644
--- a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 f3b0eac..ed4317e 100644
--- a/tests/spec/glsl-1.30/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 371bb9b..9cf2586 100644
--- a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 b1db388..3c98f6a 100644
--- a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 41053cd..b3a223d 100644
--- a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 1f9a795..cc0a7b6 100644
--- a/tests/spec/glsl-1.40/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.40/CMakeLists.gl.txt
@@ -8,7 +8,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (glsl-1.40-tf-no-position tf-no-position.c)
diff --git a/tests/spec/glsl-1.50/CMakeLists.gl.txt b/tests/spec/glsl-1.50/CMakeLists.gl.txt
index 703469b..542cc59 100644
--- a/tests/spec/glsl-1.50/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.50/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 # vim: ft=cmake:
diff --git a/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt b/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
index 2077799..5b5e097 100644
--- a/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.50/execution/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ ${piglit_SOURCE_DIR}/tests/util
 link_libraries (
 piglitutil_${piglit_target_api}
 ${OPENGL_gl_LIBRARY}
-${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (glsl-1.50-vs-input-arrays vs-input-arrays.c)
diff --git a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
index b957f02..4d7f5e3 100644
--- a/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.50/execution/geometry/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ ${piglit_SOURCE_DIR}/tests/util
 link_libraries (
 piglitutil_${piglit_target_api}
 ${OPENGL_gl_LIBRARY}
-${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (glsl-1.50-geometry-end-primitive end-primitive.c)
diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
index 475b0ac..c5d8983 100644
--- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
@@ -12,7 +12,6 @@ endif(PIGLIT_BUILD_GLX_TESTS)
 
 link_libraries (
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 IF(PIGLIT_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 62e4ccb..7db78b8 100644
--- a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
@@ -12,7 +12,6 @@ endif(PIGLIT_BUILD_GLX_TESTS)
 
 link_libraries (
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 IF(PIGLIT_BUILD_GLX_TESTS)
diff --git a/tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt b/tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt
index 399303c..4732478 100644
--- a/tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt
+++ b/tests/spec/glx_mesa_query_renderer/CMakeLists.gl.txt
@@ -12,7 +12,6 @@ endif(PIGLIT_BUILD_GLX_TESTS)
 
 link_libraries (
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 IF(PIGLIT_BUILD_GLX_TESTS)
diff --git a/tests/spec/glx_oml_sync_control/CMakeLists.gl.txt b/tests/spec/glx_oml_sync_control/CMakeLists.gl.txt
index 125e2a5..15fc752 100644
--- a/tests/spec/glx_oml_sync_control/CMakeLists.gl.txt
+++ b/tests/spec/glx_oml_sync_control/CMakeLists.gl.txt
@@ -12,7 +12,6 @@ endif(PIGLIT_BUILD_GLX_TESTS)
 
 link_libraries (
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 IF(PIGLIT_BUILD_GLX_TESTS)
diff --git a/tests/spec/khr_debug/CMakeLists.gl.txt b/tests/spec/khr_debug/CMakeLists.gl.txt
index cfbe9ed..5abb17b 100644
--- a/tests/spec/khr_debug/CMakeLists.gl.txt
+++ b/tests/spec/khr_debug/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (khr_debug-object-label_${piglit_target_api} debug-object-label.c)
diff --git a/tests/spec/mesa_pack_invert/CMakeLists.gl.txt b/tests/spec/mesa_pack_invert/CMakeLists.gl.txt
index 8768d83..d5f1bb8 100644
--- a/tests/spec/mesa_pack_invert/CMakeLists.gl.txt
+++ b/tests/spec/mesa_pack_invert/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (mesa_pack_invert-readpixels readpixels.c)
diff --git a/tests/spec/nv_conditional_render/CMakeLists.gl.txt b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
index 1bc6acd..a4cf2f5 100644
--- a/tests/spec/nv_conditional_render/CMakeLists.gl.txt
+++ b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 760a0d7..1aeb5f2 100644
--- a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
+++ b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
@@ -6,7 +6,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 6981fbc..68afa16 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_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 8dcb865..2f1dffc 100644
--- a/tests/texturing/shaders/CMakeLists.gl.txt
+++ b/tests/texturing/shaders/CMakeLists.gl.txt
@@ -7,7 +7,6 @@ include_directories(
 link_libraries (
 	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
 )
 
 piglit_add_executable (textureSize textureSize.c common.c)
-- 
2.1.0



More information about the Piglit mailing list