cmake: Move piglitutil library to piglitutil_gl

Build gl utilities to piglitutil_gl library insted of piglitutil.

As a result all executables linking to piglitutil library now link to
piglitutil_gl.

Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

68 files changed, 69 insertions, 69 deletions

diff --git a/tests/asmparsertest/CMakeLists.gl.txt b/tests/asmparsertest/CMakeLists.gl.txt
index b2efb9b7d..6ce43c758 100644
--- a/tests/asmparsertest/CMakeLists.gl.txt
+++ b/tests/asmparsertest/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 )
 
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index 64c30937b..c77848a46 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
index ddfbbef9c..fb7324818 100644
--- a/tests/egl/CMakeLists.gl.txt
+++ b/tests/egl/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 	${OPENGL_egl_LIBRARY}
diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
index 7e15ae296..de25b3883 100644
--- a/tests/fbo/CMakeLists.gl.txt
+++ b/tests/fbo/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index bf4dbe032..0e351ca98 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt
index fb06cbc73..3485b42d3 100644
--- a/tests/glean/CMakeLists.gl.txt
+++ b/tests/glean/CMakeLists.gl.txt
@@ -89,7 +89,7 @@ piglit_add_executable (glean
 )
 
 target_link_libraries (glean
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 	${X11_X11_LIB}
diff --git a/tests/glslparsertest/CMakeLists.gl.txt b/tests/glslparsertest/CMakeLists.gl.txt
index c2e9ba9a7..33555249c 100644
--- a/tests/glslparsertest/CMakeLists.gl.txt
+++ b/tests/glslparsertest/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 	)
 
 link_libraries(
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 	)
diff --git a/tests/hiz/CMakeLists.gl.txt b/tests/hiz/CMakeLists.gl.txt
index cea23cab5..d1615fc81 100644
--- a/tests/hiz/CMakeLists.gl.txt
+++ b/tests/hiz/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 	)
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 )
 
 piglit_add_library(hiz-util
diff --git a/tests/mesa/util/CMakeLists.gl.txt b/tests/mesa/util/CMakeLists.gl.txt
index f70ad417a..f55aa2816 100644
--- a/tests/mesa/util/CMakeLists.gl.txt
+++ b/tests/mesa/util/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories (
 	${PNG_INCLUDE_DIR}
 )
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 	${PNG_LIBRARIES}
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 4a5a1747a..596f5238c 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 2f9a36c89..666f99987 100644
--- a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
+++ b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 926e50d76..e7d83babe 100644
--- a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
+++ b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 ed7d96cb0..ebe0fa04e 100644
--- a/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_blend_func_extended/execution/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
index 9bab8b2e8..6c3b87c03 100644
--- a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
index fc3829d11..d191909f6 100644
--- a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
+++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_debug_output/CMakeLists.gl.txt b/tests/spec/arb_debug_output/CMakeLists.gl.txt
index 77f0feb14..de10d7259 100644
--- a/tests/spec/arb_debug_output/CMakeLists.gl.txt
+++ b/tests/spec/arb_debug_output/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
index a28660ba3..88af1f39c 100644
--- a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 a2b3dec5a..adbba29f1 100644
--- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
index 532f0fad6..57cffd222 100644
--- a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
index 82245d2fc..99937fa58 100644
--- a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
+++ b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_fragment_program/CMakeLists.gl.txt b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
index 545e6da5d..bdcf559e1 100644
--- a/tests/spec/arb_fragment_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
index ac17f81da..9764bf3ac 100644
--- a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
index 1c75bcf5c..cb6c03d6d 100644
--- a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
+++ b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
index eaf9217f9..4c6101856 100644
--- a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
+++ b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_multisample/CMakeLists.gl.txt b/tests/spec/arb_multisample/CMakeLists.gl.txt
index 08110580e..79735d806 100644
--- a/tests/spec/arb_multisample/CMakeLists.gl.txt
+++ b/tests/spec/arb_multisample/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_robustness/CMakeLists.gl.txt b/tests/spec/arb_robustness/CMakeLists.gl.txt
index 5bd3c25ba..cfec1453b 100644
--- a/tests/spec/arb_robustness/CMakeLists.gl.txt
+++ b/tests/spec/arb_robustness/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
index 479fe4881..4f3ee6a89 100644
--- a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
index 6f25470f4..9250f846c 100644
--- a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
+++ b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_shader_objects/CMakeLists.gl.txt b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
index 903a29fc3..34a689940 100644
--- a/tests/spec/arb_shader_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 7ddc58085..c4039394f 100644
--- a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_sync/CMakeLists.gl.txt b/tests/spec/arb_sync/CMakeLists.gl.txt
index f41ff5299..dd4cf3510 100644
--- a/tests/spec/arb_sync/CMakeLists.gl.txt
+++ b/tests/spec/arb_sync/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
index 23dcfadcc..05d2a5419 100644
--- a/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_buffer_object/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_texture_compression/CMakeLists.gl.txt b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
index 55039e19f..03d5f897f 100644
--- a/tests/spec/arb_texture_compression/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_texture_float/CMakeLists.gl.txt b/tests/spec/arb_texture_float/CMakeLists.gl.txt
index b8fdfdea2..4eb931279 100644
--- a/tests/spec/arb_texture_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_float/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_texture_storage/CMakeLists.gl.txt b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
index 725349ad9..67613befe 100644
--- a/tests/spec/arb_texture_storage/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
index 09fb9f9b9..9e76e7aa3 100644
--- a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
+++ b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index 71aa96baa..cdd5f143d 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
index 3cd5a5a0a..dacce87ee 100644
--- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/arb_vertex_program/CMakeLists.gl.txt b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
index 8a792262c..20b261400 100644
--- a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 5e9d9dc27..2ca905bbe 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
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
index d5bef5708..9d24720c0 100644
--- a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
index 412bb017e..2e013a2ff 100644
--- a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
+++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ext_fog_coord/CMakeLists.gl.txt b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
index b491b378a..eeee539c7 100644
--- a/tests/spec/ext_fog_coord/CMakeLists.gl.txt
+++ b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index 4eca40062..583c23d95 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
index 8ca8002bf..22d6f349e 100644
--- a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ext_packed_float/CMakeLists.gl.txt b/tests/spec/ext_packed_float/CMakeLists.gl.txt
index 9b33aa6fa..db21d7c4f 100644
--- a/tests/spec/ext_packed_float/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_float/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ext_texture_array/CMakeLists.gl.txt b/tests/spec/ext_texture_array/CMakeLists.gl.txt
index 164841221..0bf4a7db6 100644
--- a/tests/spec/ext_texture_array/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_array/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ext_texture_integer/CMakeLists.gl.txt b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
index 674e151a2..44d939950 100644
--- a/tests/spec/ext_texture_integer/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ext_timer_query/CMakeLists.gl.txt b/tests/spec/ext_timer_query/CMakeLists.gl.txt
index 3ac563fc3..04af60f52 100644
--- a/tests/spec/ext_timer_query/CMakeLists.gl.txt
+++ b/tests/spec/ext_timer_query/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
index b8c269370..9325091f6 100644
--- a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
+++ b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/gl-2.0/CMakeLists.gl.txt b/tests/spec/gl-2.0/CMakeLists.gl.txt
index 6d240035d..fb8a82f44 100644
--- a/tests/spec/gl-2.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/gl-2.0/api/CMakeLists.gl.txt b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
index 1d7737ef6..f77f056d8 100644
--- a/tests/spec/gl-2.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/gl-2.1/CMakeLists.gl.txt b/tests/spec/gl-2.1/CMakeLists.gl.txt
index edf9e715f..7e60f1dff 100644
--- a/tests/spec/gl-2.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.1/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/gl-3.0/CMakeLists.gl.txt b/tests/spec/gl-3.0/CMakeLists.gl.txt
index 19decc9f3..df9cf2570 100644
--- a/tests/spec/gl-3.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/gl-3.0/api/CMakeLists.gl.txt b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
index d916d6608..7d9678974 100644
--- a/tests/spec/gl-3.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/gl-3.1/CMakeLists.gl.txt b/tests/spec/gl-3.1/CMakeLists.gl.txt
index d30670c05..cc90e2f12 100644
--- a/tests/spec/gl-3.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.1/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 9f5d48dc9..ca7a444fe 100644
--- a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
index 69cdaa201..ff5685f92 100644
--- a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/glsl-1.30/CMakeLists.gl.txt b/tests/spec/glsl-1.30/CMakeLists.gl.txt
index b45dae9fd..f3b0eac5c 100644
--- a/tests/spec/glsl-1.30/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
index fd6691d27..a582c3fdd 100644
--- a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 6871f5c53..b1db38819 100644
--- a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
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 626c632be..41053cd22 100644
--- a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/glsl-1.40/CMakeLists.gl.txt b/tests/spec/glsl-1.40/CMakeLists.gl.txt
index dfa7f020f..66a64a78d 100644
--- a/tests/spec/glsl-1.40/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.40/CMakeLists.gl.txt
@@ -6,7 +6,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/nv_conditional_render/CMakeLists.gl.txt b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
index 4e7d4b225..1bc6acdb5 100644
--- a/tests/spec/nv_conditional_render/CMakeLists.gl.txt
+++ b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
index 98adeb4ab..760a0d7ff 100644
--- a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
+++ b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
@@ -4,7 +4,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/texturing/CMakeLists.gl.txt b/tests/texturing/CMakeLists.gl.txt
index e4d723681..e161ece04 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/texturing/shaders/CMakeLists.gl.txt b/tests/texturing/shaders/CMakeLists.gl.txt
index cab42d95a..7210c1cdc 100644
--- a/tests/texturing/shaders/CMakeLists.gl.txt
+++ b/tests/texturing/shaders/CMakeLists.gl.txt
@@ -5,7 +5,7 @@ include_directories(
 )
 
 link_libraries (
-	piglitutil
+	piglitutil_${piglit_target_api}
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 )
diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
index 082a162ac..4d07d3702 100644
--- a/tests/util/CMakeLists.gl.txt
+++ b/tests/util/CMakeLists.gl.txt
@@ -43,12 +43,12 @@ IF(BUILD_GLX_TESTS)
 	)
 ENDIF(BUILD_GLX_TESTS)
 
-piglit_add_library (piglitutil
+piglit_add_library (piglitutil_${piglit_target_api}
 	${UTIL_SOURCES}
 )
 
 if(UNIX)
-	target_link_libraries(piglitutil m)
+	target_link_libraries(piglitutil_${piglit_target_api} m)
 endif(UNIX)
 
 # vim: ft=cmake: