cmake: Each CMakeLists.txt that produces a target, rename to CMakeLists.gl.txt

In preparation for adding GLES2 targets to Piglit, it is necessary to
compartmentalize the GL targets and the GLES2 targets (of which none yet
exist) in API-specific CMake files. Since all CMake targets currently use
the OpenGL API, achieving compartmentalization is as simple as renaming
each CMakeLists.txt.

Note: This belongs to a series that adds GLES2 support to Piglit.
Signed-off-by: Chad Versace <chad.versace@intel.com>

36 files changed, 884 insertions, 837 deletions

diff --git a/tests/asmparsertest/CMakeLists.gl.txt b/tests/asmparsertest/CMakeLists.gl.txt
new file mode 100644
index 000000000..c132861df
--- /dev/null
+++ b/tests/asmparsertest/CMakeLists.gl.txt
@@ -0,0 +1,16 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${GLUT_glut_LIBRARY}
+)
+
+add_executable (asmparsertest asmparsertest.c)
+
+# vim: ft=cmake:
diff --git a/tests/asmparsertest/CMakeLists.txt b/tests/asmparsertest/CMakeLists.txt
index 52e9b6dba..144a306f4 100644
--- a/tests/asmparsertest/CMakeLists.txt
+++ b/tests/asmparsertest/CMakeLists.txt
@@ -1,14 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${GLUT_glut_LIBRARY}
-)
-
-add_executable (asmparsertest asmparsertest.c)
+piglit_include_target_api()
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
new file mode 100644
index 000000000..41527a265
--- /dev/null
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -0,0 +1,41 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/mesa/util
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (crash-cubemap-order crash-cubemap-order.c)
+add_executable (crash-texparameter-before-teximage crash-texparameter-before-teximage.c)
+add_executable (fdo9833 fdo9833.c)
+add_executable (fdo10370 fdo10370.c)
+add_executable (fdo14575 fdo14575.c)
+add_executable (r300-readcache r300-readcache.c)
+add_executable (r300-hiz-bug r300-hiz-bug.c)
+if (UNIX)
+	target_link_libraries (r300-hiz-bug m)
+endif (UNIX)
+add_executable (tex1d-2dborder tex1d-2dborder.c)
+add_executable (fdo20701 fdo20701.c)
+add_executable (point-sprite point-sprite.c)
+add_executable (fdo22540 fdo22540.c)
+add_executable (fdo23489 fdo23489.c)
+add_executable (fdo23670-depth_test fdo23670-depth_test.c)
+add_executable (fdo23670-drawpix_stencil fdo23670-drawpix_stencil.c)
+add_executable (fdo24066 fdo24066.c)
+add_executable (fdo25614-genmipmap fdo25614-genmipmap.c)
+add_executable (fdo28551 fdo28551.c)
+add_executable (fdo31934 fdo31934.c)
+add_executable (tri-tex-crash tri-tex-crash.c)
+add_executable (vbo-buffer-unmap vbo-buffer-unmap.c)
+
+# vim: ft=cmake:
diff --git a/tests/bugs/CMakeLists.txt b/tests/bugs/CMakeLists.txt
index 6b33807f9..144a306f4 100644
--- a/tests/bugs/CMakeLists.txt
+++ b/tests/bugs/CMakeLists.txt
@@ -1,39 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (crash-cubemap-order crash-cubemap-order.c)
-add_executable (crash-texparameter-before-teximage crash-texparameter-before-teximage.c)
-add_executable (fdo9833 fdo9833.c)
-add_executable (fdo10370 fdo10370.c)
-add_executable (fdo14575 fdo14575.c)
-add_executable (r300-readcache r300-readcache.c)
-add_executable (r300-hiz-bug r300-hiz-bug.c)
-if (UNIX)
-	target_link_libraries (r300-hiz-bug m)
-endif (UNIX)
-add_executable (tex1d-2dborder tex1d-2dborder.c)
-add_executable (fdo20701 fdo20701.c)
-add_executable (point-sprite point-sprite.c)
-add_executable (fdo22540 fdo22540.c)
-add_executable (fdo23489 fdo23489.c)
-add_executable (fdo23670-depth_test fdo23670-depth_test.c)
-add_executable (fdo23670-drawpix_stencil fdo23670-drawpix_stencil.c)
-add_executable (fdo24066 fdo24066.c)
-add_executable (fdo25614-genmipmap fdo25614-genmipmap.c)
-add_executable (fdo28551 fdo28551.c)
-add_executable (fdo31934 fdo31934.c)
-add_executable (tri-tex-crash tri-tex-crash.c)
-add_executable (vbo-buffer-unmap vbo-buffer-unmap.c)
+piglit_include_target_api()
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
new file mode 100644
index 000000000..d967b854b
--- /dev/null
+++ b/tests/egl/CMakeLists.gl.txt
@@ -0,0 +1,26 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${OPENGL_egl_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	add_executable (egl-nok-swap-region egl-util.c egl-nok-swap-region.c)
+	target_link_libraries(egl-nok-swap-region pthread X11)
+	add_executable (egl-nok-texture-from-pixmap egl-util.c egl-nok-texture-from-pixmap.c)
+	target_link_libraries(egl-nok-texture-from-pixmap pthread X11)
+	add_executable (egl-create-surface egl-util.c egl-create-surface.c)
+	target_link_libraries(egl-create-surface pthread X11)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+# vim: ft=cmake:
diff --git a/tests/egl/CMakeLists.txt b/tests/egl/CMakeLists.txt
index 0458ea5cb..144a306f4 100644
--- a/tests/egl/CMakeLists.txt
+++ b/tests/egl/CMakeLists.txt
@@ -1,27 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${OPENGL_egl_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	add_executable (egl-nok-swap-region egl-util.c egl-nok-swap-region.c)
-	target_link_libraries(egl-nok-swap-region pthread X11)
-
-	add_executable (egl-nok-texture-from-pixmap egl-util.c egl-nok-texture-from-pixmap.c)
-	target_link_libraries(egl-nok-texture-from-pixmap pthread X11)
-
-	add_executable (egl-create-surface egl-util.c egl-create-surface.c)
-	target_link_libraries(egl-create-surface pthread X11)
-
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+piglit_include_target_api()
diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
new file mode 100644
index 000000000..e2a95baa7
--- /dev/null
+++ b/tests/fbo/CMakeLists.gl.txt
@@ -0,0 +1,71 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/mesa/util
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (fbo-1d fbo-1d.c)
+add_executable (fbo-depth fbo-depth.c)
+add_executable (fbo-depth-sample-compare fbo-depth-sample-compare.c)
+add_executable (fbo-depthtex fbo-depthtex.c)
+add_executable (fbo-3d fbo-3d.c)
+add_executable (fbo-array fbo-array.c)
+add_executable (fbo-alpha fbo-alpha.c)
+add_executable (fbo-luminance-alpha fbo-luminance-alpha.c)
+add_executable (fbo-blit fbo-blit.c)
+add_executable (fbo-blit-d24s8 fbo-blit-d24s8.c)
+add_executable (fbo-copypix fbo-copypix.c)
+add_executable (fbo-readdrawpix fbo-readdrawpix.c)
+add_executable (fbo-clearmipmap fbo-clearmipmap.c)
+add_executable (fbo-clear-formats fbo-clear-formats.c)
+add_executable (fbo-drawbuffers fbo-drawbuffers.c)
+add_executable (fbo-drawbuffers-arbfp fbo-drawbuffers-arbfp.c)
+add_executable (fbo-drawbuffers-fragcolor fbo-drawbuffers-fragcolor.c)
+add_executable (fbo-drawbuffers-maxtargets fbo-drawbuffers-maxtargets.c)
+add_executable (fbo-drawbuffers2-blend fbo-drawbuffers2-blend.c)
+add_executable (fbo-drawbuffers2-colormask fbo-drawbuffers2-colormask.c)
+add_executable (fbo-draw-buffers-blend fbo-draw-buffers-blend.c)
+add_executable (fbo-flushing fbo-flushing.c)
+add_executable (fbo-fragcoord fbo-fragcoord.c)
+add_executable (fbo-fragcoord2 fbo-fragcoord2.c)
+add_executable (fbo-generatemipmap fbo-generatemipmap.c)
+add_executable (fbo-generatemipmap-array fbo-generatemipmap-array.c)
+add_executable (fbo-generatemipmap-filtering fbo-generatemipmap-filtering.c)
+add_executable (fbo-generatemipmap-formats fbo-generatemipmap-formats.c)
+add_executable (fbo-generatemipmap-scissor fbo-generatemipmap-scissor.c)
+add_executable (fbo-generatemipmap-nonsquare fbo-generatemipmap-nonsquare.c)
+add_executable (fbo-generatemipmap-npot fbo-generatemipmap-npot.c)
+add_executable (fbo-generatemipmap-viewport fbo-generatemipmap-viewport.c)
+add_executable (fbo-getframebufferattachmentparameter-01 fbo-getframebufferattachmentparameter-01.c)
+add_executable (fbo-incomplete-texture-01 fbo-incomplete-texture-01.c)
+add_executable (fbo-incomplete-texture-02 fbo-incomplete-texture-02.c)
+add_executable (fbo-incomplete-texture-03 fbo-incomplete-texture-03.c)
+add_executable (fbo-incomplete-texture-04 fbo-incomplete-texture-04.c)
+add_executable (fbo-integer fbo-integer.c)
+add_executable (fbo-maxsize fbo-maxsize.c)
+add_executable (fbo-nodepth-test fbo-nodepth-test.c)
+add_executable (fbo-nostencil-test fbo-nostencil-test.c)
+add_executable (fbo-readpixels fbo-readpixels.c)
+add_executable (fbo-rg fbo-rg.c)
+add_executable (fbo-srgb fbo-srgb.c)
+IF (UNIX)
+	target_link_libraries (fbo-srgb m)
+ENDIF (UNIX)
+add_executable (fbo-storage-formats fbo-storage-formats.c)
+add_executable (fbo-pbo-readpixels-small fbo-pbo-readpixels-small.c)
+add_executable (fbo-copyteximage fbo-copyteximage.c)
+add_executable (fbo-copyteximage-simple fbo-copyteximage-simple.c)
+add_executable (fbo-cubemap fbo-cubemap.c)
+add_executable (fbo-scissor-bitmap fbo-scissor-bitmap.c)
+
+# vim: ft=cmake:
diff --git a/tests/fbo/CMakeLists.txt b/tests/fbo/CMakeLists.txt
index d3d5292d4..144a306f4 100644
--- a/tests/fbo/CMakeLists.txt
+++ b/tests/fbo/CMakeLists.txt
@@ -1,69 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (fbo-1d fbo-1d.c)
-add_executable (fbo-depth fbo-depth.c)
-add_executable (fbo-depth-sample-compare fbo-depth-sample-compare.c)
-add_executable (fbo-depthtex fbo-depthtex.c)
-add_executable (fbo-3d fbo-3d.c)
-add_executable (fbo-array fbo-array.c)
-add_executable (fbo-alpha fbo-alpha.c)
-add_executable (fbo-luminance-alpha fbo-luminance-alpha.c)
-add_executable (fbo-blit fbo-blit.c)
-add_executable (fbo-blit-d24s8 fbo-blit-d24s8.c)
-add_executable (fbo-copypix fbo-copypix.c)
-add_executable (fbo-readdrawpix fbo-readdrawpix.c)
-add_executable (fbo-clearmipmap fbo-clearmipmap.c)
-add_executable (fbo-clear-formats fbo-clear-formats.c)
-add_executable (fbo-drawbuffers fbo-drawbuffers.c)
-add_executable (fbo-drawbuffers-arbfp fbo-drawbuffers-arbfp.c)
-add_executable (fbo-drawbuffers-fragcolor fbo-drawbuffers-fragcolor.c)
-add_executable (fbo-drawbuffers-maxtargets fbo-drawbuffers-maxtargets.c)
-add_executable (fbo-drawbuffers2-blend fbo-drawbuffers2-blend.c)
-add_executable (fbo-drawbuffers2-colormask fbo-drawbuffers2-colormask.c)
-add_executable (fbo-draw-buffers-blend fbo-draw-buffers-blend.c)
-add_executable (fbo-flushing fbo-flushing.c)
-add_executable (fbo-fragcoord fbo-fragcoord.c)
-add_executable (fbo-fragcoord2 fbo-fragcoord2.c)
-add_executable (fbo-generatemipmap fbo-generatemipmap.c)
-add_executable (fbo-generatemipmap-array fbo-generatemipmap-array.c)
-add_executable (fbo-generatemipmap-filtering fbo-generatemipmap-filtering.c)
-add_executable (fbo-generatemipmap-formats fbo-generatemipmap-formats.c)
-add_executable (fbo-generatemipmap-scissor fbo-generatemipmap-scissor.c)
-add_executable (fbo-generatemipmap-nonsquare fbo-generatemipmap-nonsquare.c)
-add_executable (fbo-generatemipmap-npot fbo-generatemipmap-npot.c)
-add_executable (fbo-generatemipmap-viewport fbo-generatemipmap-viewport.c)
-add_executable (fbo-getframebufferattachmentparameter-01 fbo-getframebufferattachmentparameter-01.c)
-add_executable (fbo-incomplete-texture-01 fbo-incomplete-texture-01.c)
-add_executable (fbo-incomplete-texture-02 fbo-incomplete-texture-02.c)
-add_executable (fbo-incomplete-texture-03 fbo-incomplete-texture-03.c)
-add_executable (fbo-incomplete-texture-04 fbo-incomplete-texture-04.c)
-add_executable (fbo-integer fbo-integer.c)
-add_executable (fbo-maxsize fbo-maxsize.c)
-add_executable (fbo-nodepth-test fbo-nodepth-test.c)
-add_executable (fbo-nostencil-test fbo-nostencil-test.c)
-add_executable (fbo-readpixels fbo-readpixels.c)
-add_executable (fbo-rg fbo-rg.c)
-add_executable (fbo-srgb fbo-srgb.c)
-IF (UNIX)
-	target_link_libraries (fbo-srgb m)
-ENDIF (UNIX)
-add_executable (fbo-storage-formats fbo-storage-formats.c)
-add_executable (fbo-pbo-readpixels-small fbo-pbo-readpixels-small.c)
-add_executable (fbo-copyteximage fbo-copyteximage.c)
-add_executable (fbo-copyteximage-simple fbo-copyteximage-simple.c)
-add_executable (fbo-cubemap fbo-cubemap.c)
-add_executable (fbo-scissor-bitmap fbo-scissor-bitmap.c)
+piglit_include_target_api()
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
new file mode 100644
index 000000000..5a4911913
--- /dev/null
+++ b/tests/general/CMakeLists.gl.txt
@@ -0,0 +1,97 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (bgra-vert-attrib-pointer bgra-vert-attrib-pointer.c)
+add_executable (bgra-sec-color-pointer bgra-sec-color-pointer.c)
+add_executable (blendminmax blendminmax.c)
+add_executable (blendsquare blendsquare.c)
+add_executable (clear-varray-2.0 clear-varray-2.0.c)
+add_executable (depth-clamp-range depth-clamp-range.c)
+add_executable (dlist-clear dlist-clear.c)
+add_executable (dlist-fdo3129-01 dlist-fdo3129-01.c)
+add_executable (dlist-fdo3129-02 dlist-fdo3129-02.c)
+add_executable (depth_clamp depth_clamp.c)
+add_executable (depthfunc depthfunc.c)
+add_executable (depthrange-clear depthrange-clear.c)
+add_executable (draw-batch draw-batch.c)
+add_executable (draw-elements draw-elements.c)
+add_executable (draw-elements-base-vertex draw-elements-base-vertex.c)
+add_executable (draw-elements-base-vertex-neg draw-elements-base-vertex-neg.c)
+IF (UNIX)
+	target_link_libraries (draw-elements-base-vertex-neg m)
+ENDIF (UNIX)
+add_executable (draw-elements-vs-inputs draw-elements-vs-inputs.c)
+add_executable (draw-instanced draw-instanced.c)
+add_executable (draw-instanced-divisor draw-instanced-divisor.c)
+add_executable (draw-vertices draw-vertices.c)
+add_executable (draw-vertices-half-float draw-vertices-half-float.c)
+add_executable (fog-modes fog-modes.c)
+IF (UNIX)
+	target_link_libraries (fog-modes m)
+ENDIF (UNIX)
+add_executable (framebuffer-srgb framebuffer-srgb.c)
+IF (UNIX)
+	target_link_libraries (framebuffer-srgb m)
+ENDIF (UNIX)
+add_executable (geterror-inside-begin geterror-inside-begin.c)
+add_executable (geterror-invalid-enum geterror-invalid-enum.c)
+add_executable (isbufferobj isbufferobj.c)
+add_executable (linestipple linestipple.c)
+add_executable (line-aa-width line-aa-width.c)
+IF (UNIX)
+	target_link_libraries (line-aa-width m)
+ENDIF (UNIX)
+add_executable (longprim longprim.c)
+add_executable (pbo-drawpixels pbo-drawpixels.c)
+add_executable (pbo-read-argb8888 pbo-read-argb8888.c)
+add_executable (pbo-readpixels-small pbo-readpixels-small.c)
+add_executable (pbo-teximage pbo-teximage.c)
+add_executable (pbo-teximage-tiling pbo-teximage-tiling.c)
+add_executable (pbo-teximage-tiling-2 pbo-teximage-tiling-2.c)
+add_executable (point-line-no-cull point-line-no-cull.c)
+add_executable (primitive-restart primitive-restart.c)
+add_executable (provoking-vertex provoking-vertex.c)
+add_executable (oes-read-format oes-read-format.c)
+add_executable (read-front read-front.c)
+add_executable (scissor-bitmap scissor-bitmap.c)
+add_executable (scissor-clear scissor-clear.c)
+add_executable (scissor-copypixels scissor-copypixels.c)
+add_executable (scissor-depth-clear scissor-depth-clear.c)
+add_executable (scissor-many scissor-many.c)
+add_executable (scissor-offscreen scissor-offscreen.c)
+add_executable (scissor-stencil-clear scissor-stencil-clear.c)
+add_executable (stencil-drawpixels stencil-drawpixels.c)
+add_executable (stencil-twoside stencil-twoside.c)
+add_executable (stencil-wrap stencil-wrap.c)
+add_executable (sync_api sync_api.c)
+add_executable (texgen texgen.c)
+add_executable (texunits texunits.c)
+add_executable (timer_query timer_query.c)
+add_executable (user-clip user-clip.c)
+add_executable (varray-disabled varray-disabled.c)
+add_executable (vao-01 vao-01.c)
+add_executable (vao-02 vao-02.c)
+add_executable (vbo-map-remap vbo-map-remap.c)
+add_executable (vbo-subdata-zero vbo-subdata-zero.c)
+add_executable (vbo-subdata-sync vbo-subdata-sync.c)
+add_executable (windowoverlap windowoverlap.c)
+add_executable (object_purgeable-api-pbo object_purgeable-api-pbo.c object_purgeable.c)
+add_executable (object_purgeable-api-texture object_purgeable-api-texture.c object_purgeable.c)
+add_executable (object_purgeable-api-vbo object_purgeable-api-vbo.c object_purgeable.c)
+add_executable (occlusion_query occlusion_query.c)
+add_executable (occlusion-query-discard occlusion-query-discard.c)
+add_executable (quad-invariance quad-invariance.c)
+
+# vim: ft=cmake:
diff --git a/tests/general/CMakeLists.txt b/tests/general/CMakeLists.txt
index bd7bc9a74..144a306f4 100644
--- a/tests/general/CMakeLists.txt
+++ b/tests/general/CMakeLists.txt
@@ -1,95 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (bgra-vert-attrib-pointer bgra-vert-attrib-pointer.c)
-add_executable (bgra-sec-color-pointer bgra-sec-color-pointer.c)
-add_executable (blendminmax blendminmax.c)
-add_executable (blendsquare blendsquare.c)
-add_executable (clear-varray-2.0 clear-varray-2.0.c)
-add_executable (depth-clamp-range depth-clamp-range.c)
-add_executable (dlist-clear dlist-clear.c)
-add_executable (dlist-fdo3129-01 dlist-fdo3129-01.c)
-add_executable (dlist-fdo3129-02 dlist-fdo3129-02.c)
-add_executable (depth_clamp depth_clamp.c)
-add_executable (depthfunc depthfunc.c)
-add_executable (depthrange-clear depthrange-clear.c)
-add_executable (draw-batch draw-batch.c)
-add_executable (draw-elements draw-elements.c)
-add_executable (draw-elements-base-vertex draw-elements-base-vertex.c)
-add_executable (draw-elements-base-vertex-neg draw-elements-base-vertex-neg.c)
-IF (UNIX)
-	target_link_libraries (draw-elements-base-vertex-neg m)
-ENDIF (UNIX)
-add_executable (draw-elements-vs-inputs draw-elements-vs-inputs.c)
-add_executable (draw-instanced draw-instanced.c)
-add_executable (draw-instanced-divisor draw-instanced-divisor.c)
-add_executable (draw-vertices draw-vertices.c)
-add_executable (draw-vertices-half-float draw-vertices-half-float.c)
-add_executable (fog-modes fog-modes.c)
-IF (UNIX)
-	target_link_libraries (fog-modes m)
-ENDIF (UNIX)
-add_executable (framebuffer-srgb framebuffer-srgb.c)
-IF (UNIX)
-	target_link_libraries (framebuffer-srgb m)
-ENDIF (UNIX)
-add_executable (geterror-inside-begin geterror-inside-begin.c)
-add_executable (geterror-invalid-enum geterror-invalid-enum.c)
-add_executable (isbufferobj isbufferobj.c)
-add_executable (linestipple linestipple.c)
-add_executable (line-aa-width line-aa-width.c)
-IF (UNIX)
-	target_link_libraries (line-aa-width m)
-ENDIF (UNIX)
-add_executable (longprim longprim.c)
-add_executable (pbo-drawpixels pbo-drawpixels.c)
-add_executable (pbo-read-argb8888 pbo-read-argb8888.c)
-add_executable (pbo-readpixels-small pbo-readpixels-small.c)
-add_executable (pbo-teximage pbo-teximage.c)
-add_executable (pbo-teximage-tiling pbo-teximage-tiling.c)
-add_executable (pbo-teximage-tiling-2 pbo-teximage-tiling-2.c)
-add_executable (point-line-no-cull point-line-no-cull.c)
-add_executable (primitive-restart primitive-restart.c)
-add_executable (provoking-vertex provoking-vertex.c)
-add_executable (oes-read-format oes-read-format.c)
-add_executable (read-front read-front.c)
-add_executable (scissor-bitmap scissor-bitmap.c)
-add_executable (scissor-clear scissor-clear.c)
-add_executable (scissor-copypixels scissor-copypixels.c)
-add_executable (scissor-depth-clear scissor-depth-clear.c)
-add_executable (scissor-many scissor-many.c)
-add_executable (scissor-offscreen scissor-offscreen.c)
-add_executable (scissor-stencil-clear scissor-stencil-clear.c)
-add_executable (stencil-drawpixels stencil-drawpixels.c)
-add_executable (stencil-twoside stencil-twoside.c)
-add_executable (stencil-wrap stencil-wrap.c)
-add_executable (sync_api sync_api.c)
-add_executable (texgen texgen.c)
-add_executable (texunits texunits.c)
-add_executable (timer_query timer_query.c)
-add_executable (user-clip user-clip.c)
-add_executable (varray-disabled varray-disabled.c)
-add_executable (vao-01 vao-01.c)
-add_executable (vao-02 vao-02.c)
-add_executable (vbo-map-remap vbo-map-remap.c)
-add_executable (vbo-subdata-zero vbo-subdata-zero.c)
-add_executable (vbo-subdata-sync vbo-subdata-sync.c)
-add_executable (windowoverlap windowoverlap.c)
-add_executable (object_purgeable-api-pbo object_purgeable-api-pbo.c object_purgeable.c)
-add_executable (object_purgeable-api-texture object_purgeable-api-texture.c object_purgeable.c)
-add_executable (object_purgeable-api-vbo object_purgeable-api-vbo.c object_purgeable.c)
-add_executable (occlusion_query occlusion_query.c)
-add_executable (occlusion-query-discard occlusion-query-discard.c)
-add_executable (quad-invariance quad-invariance.c)
+piglit_include_target_api()
diff --git a/tests/glean/CMakeLists.gl.cmake b/tests/glean/CMakeLists.gl.cmake
new file mode 100644
index 000000000..749b4b0b1
--- /dev/null
+++ b/tests/glean/CMakeLists.gl.cmake
@@ -0,0 +1,96 @@
+if (MSVC)
+	add_definitions ( -D__WIN__ -D__MS__ )
+ELSEIF (APPLE)
+	add_definitions ( -D__AGL__ -D__UNIX__ )
+	FIND_LIBRARY(CARBON_LIBRARY Carbon)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
+ELSE ()
+	add_definitions ( -D__X11__ -D__UNIX__ )
+ENDIF ()
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${TIFF_INCLUDE_DIR}
+)
+
+add_executable (glean
+	codedid.cpp
+	dsconfig.cpp
+	dsfilt.cpp
+	dsurf.cpp
+	environ.cpp
+	geomrend.cpp
+	geomutil.cpp
+	glutils.cpp
+	main.cpp
+	misc.cpp
+	options.cpp
+	rc.cpp
+	tapi2.cpp
+	tbasic.cpp
+	tbasicperf.cpp
+	tbinding.cpp
+	tblend.cpp
+	tbufferobject.cpp
+	tchgperf.cpp
+	tclipflat.cpp
+	tdepthstencil.cpp
+	test.cpp
+	tfbo.cpp
+	tfpexceptions.cpp
+	tfragprog1.cpp
+	tgetstr.cpp
+	tglsl1.cpp
+	tlogicop.cpp
+	tmaskedclear.cpp
+	tmultitest.cpp
+	toccluqry.cpp
+	torthpos.cpp
+	tpaths.cpp
+	tpbo.cpp
+	tpgos.cpp
+	tpixelformats.cpp
+	tpointatten.cpp
+	tpointsprite.cpp
+	treadpix.cpp
+	treadpixperf.cpp
+	trgbtris.cpp
+	tscissor.cpp
+	tshaderapi.cpp
+	tstencil2.cpp
+	tteapot.cpp
+	ttexcombine.cpp
+	ttexcombine4.cpp
+	ttexcube.cpp
+	ttexenv.cpp
+	ttexgen.cpp
+	ttexrect.cpp
+	ttexswizzle.cpp
+	ttexture_srgb.cpp
+	ttexunits.cpp
+	tvertarraybgra.cpp
+	tvertattrib.cpp
+	tvertprog1.cpp
+	tvtxperf.cpp
+	winsys.cpp
+	gl.cpp
+	image_misc.cpp
+	pack.cpp
+	rdtiff.cpp
+	reg.cpp
+	unpack.cpp
+	wrtiff.cpp
+	basic.cpp
+	lex.cpp
+	timer.cpp
+)
+
+target_link_libraries (glean
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${X11_X11_LIB}
+	${TIFF_LIBRARY}
+	${CARBON_LIBRARY}
+)
diff --git a/tests/glean/CMakeLists.txt b/tests/glean/CMakeLists.txt
index 9bf375dab..144a306f4 100644
--- a/tests/glean/CMakeLists.txt
+++ b/tests/glean/CMakeLists.txt
@@ -1,97 +1 @@
-if (MSVC)
-	add_definitions ( -D__WIN__ -D__MS__ )
-ELSEIF (APPLE)
-	add_definitions ( -D__AGL__ -D__UNIX__ )
-	FIND_LIBRARY(CARBON_LIBRARY Carbon)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32")
-ELSE ()
-	add_definitions ( -D__X11__ -D__UNIX__ )
-ENDIF ()
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${TIFF_INCLUDE_DIR}
-)
-
-add_executable (glean
-	codedid.cpp
-	dsconfig.cpp
-	dsfilt.cpp
-	dsurf.cpp
-	environ.cpp
-	geomrend.cpp
-	geomutil.cpp
-	glutils.cpp
-	main.cpp
-	misc.cpp
-	options.cpp
-	rc.cpp
-	tapi2.cpp
-	tbasic.cpp
-	tbasicperf.cpp
-	tbinding.cpp
-	tblend.cpp
-	tbufferobject.cpp
-	tchgperf.cpp
-	tclipflat.cpp
-	tdepthstencil.cpp
-	test.cpp
-	tfbo.cpp
-	tfpexceptions.cpp
-	tfragprog1.cpp
-	tgetstr.cpp
-	tglsl1.cpp
-	tlogicop.cpp
-	tmaskedclear.cpp
-	tmultitest.cpp
-	toccluqry.cpp
-	torthpos.cpp
-	tpaths.cpp
-	tpbo.cpp
-	tpgos.cpp
-	tpixelformats.cpp
-	tpointatten.cpp
-	tpointsprite.cpp
-	treadpix.cpp
-	treadpixperf.cpp
-	trgbtris.cpp
-	tscissor.cpp
-	tshaderapi.cpp
-	tstencil2.cpp
-	tteapot.cpp
-	ttexcombine.cpp
-	ttexcombine4.cpp
-	ttexcube.cpp
-	ttexenv.cpp
-	ttexgen.cpp
-	ttexrect.cpp
-	ttexswizzle.cpp
-	ttexture_srgb.cpp
-	ttexunits.cpp
-	tvertarraybgra.cpp
-	tvertattrib.cpp
-	tvertprog1.cpp
-	tvtxperf.cpp
-	winsys.cpp
-	gl.cpp
-	image_misc.cpp
-	pack.cpp
-	rdtiff.cpp
-	reg.cpp
-	unpack.cpp
-	wrtiff.cpp
-	basic.cpp
-	lex.cpp
-	timer.cpp
-)
-
-target_link_libraries (glean
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${X11_X11_LIB}
-	${TIFF_LIBRARY}
-	${CARBON_LIBRARY}
-)
-
+piglit_include_target_api()
diff --git a/tests/glslparsertest/CMakeLists.gl.txt b/tests/glslparsertest/CMakeLists.gl.txt
new file mode 100644
index 000000000..28e716ee8
--- /dev/null
+++ b/tests/glslparsertest/CMakeLists.gl.txt
@@ -0,0 +1,18 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (glslparsertest glslparsertest.c)
+
+# vim: ft=cmake:
diff --git a/tests/glslparsertest/CMakeLists.txt b/tests/glslparsertest/CMakeLists.txt
index ee7011125..144a306f4 100644
--- a/tests/glslparsertest/CMakeLists.txt
+++ b/tests/glslparsertest/CMakeLists.txt
@@ -1,16 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (glslparsertest glslparsertest.c)
+piglit_include_target_api()
diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
new file mode 100644
index 000000000..9558f2a91
--- /dev/null
+++ b/tests/glx/CMakeLists.gl.txt
@@ -0,0 +1,34 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitglxutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+	${X11_X11_LIB}
+)
+
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	add_executable (glx-shader-sharing glx-shader-sharing.c)
+	add_executable (glx-destroycontext-1 glx-destroycontext-1.c)
+	add_executable (glx-destroycontext-2 glx-destroycontext-2.c)
+	add_executable (glx-multithread glx-multithread.c)
+	add_executable (glx-make-current glx-make-current.c)
+	add_executable (glx-swap-event glx-swap-event.c)
+	add_executable (glx-make-glxdrawable-current glx-make-glxdrawable-current.c)
+	target_link_libraries(glx-multithread pthread X11)
+	add_executable (glx-swap-exchange glx-swap-exchange.c)
+	target_link_libraries(glx-swap-exchange X11)
+	add_executable (glx-tfp glx-tfp.c)
+	target_link_libraries(glx-tfp X11)
+
+	add_executable (glx-visuals-stencil glx-visuals-stencil.c)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+# vim: ft=cmake:
diff --git a/tests/glx/CMakeLists.txt b/tests/glx/CMakeLists.txt
index 18f2a2767..144a306f4 100644
--- a/tests/glx/CMakeLists.txt
+++ b/tests/glx/CMakeLists.txt
@@ -1,32 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitglxutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-	${X11_X11_LIB}
-)
-
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	add_executable (glx-shader-sharing glx-shader-sharing.c)
-	add_executable (glx-destroycontext-1 glx-destroycontext-1.c)
-	add_executable (glx-destroycontext-2 glx-destroycontext-2.c)
-	add_executable (glx-multithread glx-multithread.c)
-	add_executable (glx-make-current glx-make-current.c)
-	add_executable (glx-swap-event glx-swap-event.c)
-	add_executable (glx-make-glxdrawable-current glx-make-glxdrawable-current.c)
-	target_link_libraries(glx-multithread pthread X11)
-	add_executable (glx-swap-exchange glx-swap-exchange.c)
-	target_link_libraries(glx-swap-exchange X11)
-	add_executable (glx-tfp glx-tfp.c)
-	target_link_libraries(glx-tfp X11)
-
-	add_executable (glx-visuals-stencil glx-visuals-stencil.c)
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+piglit_include_target_api()
diff --git a/tests/mesa/tests/CMakeLists.gl.txt b/tests/mesa/tests/CMakeLists.gl.txt
new file mode 100644
index 000000000..039521717
--- /dev/null
+++ b/tests/mesa/tests/CMakeLists.gl.txt
@@ -0,0 +1,26 @@
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${PNG_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/mesa/util
+)
+
+link_libraries (
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${PNG_LIBRARIES}
+	${TIFF_LIBRARY}
+	mesautil
+)
+
+add_definitions (
+	${PNG_DEFINITIONS}
+)
+
+add_executable (texline texline.c)
+IF (UNIX)
+       target_link_libraries (texline m)
+ENDIF (UNIX)
+
+# vim: ft=cmake:
diff --git a/tests/mesa/tests/CMakeLists.txt b/tests/mesa/tests/CMakeLists.txt
index bcf2f4638..144a306f4 100644
--- a/tests/mesa/tests/CMakeLists.txt
+++ b/tests/mesa/tests/CMakeLists.txt
@@ -1,24 +1 @@
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${PNG_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/mesa/util
-)
-
-link_libraries (
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${PNG_LIBRARIES}
-	${TIFF_LIBRARY}
-	mesautil
-)
-
-add_definitions (
-	${PNG_DEFINITIONS}
-)
-
-add_executable (texline texline.c)
-IF (UNIX)
-       target_link_libraries (texline m)
-ENDIF (UNIX)
+piglit_include_target_api()
diff --git a/tests/mesa/util/CMakeLists.gl.txt b/tests/mesa/util/CMakeLists.gl.txt
new file mode 100644
index 000000000..1635cacd7
--- /dev/null
+++ b/tests/mesa/util/CMakeLists.gl.txt
@@ -0,0 +1,23 @@
+
+include_directories (
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${PNG_INCLUDE_DIR}
+)
+link_libraries (
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+	${PNG_LIBRARIES}
+)
+add_definitions (
+	${PNG_DEFINITIONS}
+)
+
+add_library (mesautil
+	readtex.c
+	writeimg.c
+)
+
+# vim: ft=cmake:
diff --git a/tests/mesa/util/CMakeLists.txt b/tests/mesa/util/CMakeLists.txt
index c954f2497..144a306f4 100644
--- a/tests/mesa/util/CMakeLists.txt
+++ b/tests/mesa/util/CMakeLists.txt
@@ -1,21 +1 @@
-
-include_directories (
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${PNG_INCLUDE_DIR}
-)
-link_libraries (
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-	${PNG_LIBRARIES}
-)
-add_definitions (
-	${PNG_DEFINITIONS}
-)
-
-add_library (mesautil
-	readtex.c
-	writeimg.c
-)
+piglit_include_target_api()
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
new file mode 100644
index 000000000..5de35d112
--- /dev/null
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -0,0 +1,175 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/mesa/util
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (activeprogram-bad-program activeprogram-bad-program.c)
+add_executable (activeprogram-get activeprogram-get.c)
+add_executable (ati-fs-bad-delete ati-fs-bad-delete.c)
+add_executable (attribute0 attribute0.c)
+add_executable (createshaderprogram-bad-type createshaderprogram-bad-type.c)
+add_executable (createshaderprogram-attached-shaders createshaderprogram-attached-shaders.c)
+add_executable (trinity-fp1 trinity-fp1.c)
+add_executable (fp-abs-01 fp-abs-01.c)
+add_executable (fp-abs-02 fp-abs-02.c)
+add_executable (fp-condition_codes-01 fp-condition_codes-01.c)
+add_executable (fp-lit-mask fp-lit-mask.c)
+add_executable (fp-fog fp-fog.c)
+add_executable (fp-formats fp-formats.c)
+add_executable (fp-fragment-position fp-fragment-position.c)
+add_executable (fp-generic fp-generic.c)
+add_executable (fp-kil fp-kil.c)
+add_executable (fp-incomplete-tex fp-incomplete-tex.c)
+add_executable (fp-indirections fp-indirections.c)
+add_executable (fp-indirections2 fp-indirections2.c)
+add_executable (fp-long-alu fp-long-alu.c)
+add_executable (fp-rfl fp-rfl.c)
+IF (UNIX)
+	target_link_libraries(fp-rfl m)
+ENDIF (UNIX)
+add_executable (fp-set-01 fp-set-01.c)
+add_executable (fp-set-02 fp-set-02.c)
+add_executable (fp-unpack-01 fp-unpack-01.c)
+IF (UNIX)
+	target_link_libraries(fp-unpack-01 m)
+ENDIF (UNIX)
+add_executable (glsl-arb-fragment-coord-conventions glsl-arb-fragment-coord-conventions.c)
+add_executable (glsl-arb-fragment-coord-conventions-define glsl-arb-fragment-coord-conventions-define.c)
+add_executable (glsl-bindattriblocation glsl-bindattriblocation.c)
+add_executable (glsl-bug-22603 glsl-bug-22603.c)
+add_executable (glsl-dlist-getattriblocation glsl-dlist-getattriblocation.c)
+add_executable (glsl-explicit-location-01 glsl-explicit-location-01.c)
+add_executable (glsl-explicit-location-02 glsl-explicit-location-02.c)
+add_executable (glsl-explicit-location-03 glsl-explicit-location-03.c)
+add_executable (glsl-explicit-location-04 glsl-explicit-location-04.c)
+add_executable (glsl-explicit-location-05 glsl-explicit-location-05.c)
+add_executable (glsl-getattriblocation glsl-getattriblocation.c)
+add_executable (glsl-getactiveuniform-array-size glsl-getactiveuniform-array-size.c)
+add_executable (glsl-getactiveuniform-count glsl-getactiveuniform-count.c)
+add_executable (glsl-getactiveuniform-length glsl-getactiveuniform-length.c)
+add_executable (getuniform-01 getuniform-01.c)
+add_executable (glsl-invalid-asm-01 glsl-invalid-asm-01.c)
+add_executable (glsl-invalid-asm-02 glsl-invalid-asm-02.c)
+add_executable (glsl-novertexdata glsl-novertexdata.c)
+add_executable (glsl-orangebook-ch06-bump glsl-orangebook-ch06-bump.c)
+add_executable (glsl-reload-source glsl-reload-source.c)
+add_executable (glsl-unused-varying glsl-unused-varying.c)
+add_executable (glsl-uniform-update glsl-uniform-update.c)
+add_executable (glsl-uniform-out-of-bounds glsl-uniform-out-of-bounds.c)
+add_executable (glsl-fs-bug25902 glsl-fs-bug25902.c)
+add_executable (glsl-fs-color-matrix glsl-fs-color-matrix.c)
+add_executable (glsl-fs-exp2 glsl-fs-exp2.c)
+add_executable (glsl-fs-flat-color glsl-fs-flat-color.c)
+add_executable (glsl-fs-fragcoord glsl-fs-fragcoord.c)
+add_executable (glsl-fs-loop glsl-fs-loop.c)
+add_executable (glsl-fs-loop-nested glsl-fs-loop-nested.c)
+add_executable (glsl-fs-mix glsl-fs-mix.c)
+add_executable (glsl-fs-mix-constant glsl-fs-mix-constant.c)
+IF (NOT MSVC)
+	add_executable (glsl-fs-raytrace-bug27060 glsl-fs-raytrace-bug27060.c)
+ENDIF (NOT MSVC)
+add_executable (glsl-fs-sampler-numbering glsl-fs-sampler-numbering.c)
+add_executable (glsl-fs-shader-stencil-export glsl-fs-shader-stencil-export.c)
+add_executable (glsl-fs-sqrt-branch glsl-fs-sqrt-branch.c)
+add_executable (glsl-fs-sqrt-zero glsl-fs-sqrt-zero.c)
+add_executable (glsl-fs-texturecube glsl-fs-texturecube.c)
+add_executable (glsl-fs-texturecube-2 glsl-fs-texturecube-2.c)
+add_executable (glsl-fs-texture2drect glsl-fs-texture2drect.c)
+add_executable (glsl-fs-texturelod-01 glsl-fs-texturelod-01.c)
+add_executable (glsl-fs-user-varying-ff glsl-fs-user-varying-ff.c)
+add_executable (glsl-vs-arrays glsl-vs-arrays.c)
+add_executable (glsl-vs-mov-after-deref glsl-vs-mov-after-deref.c)
+add_executable (glsl-vs-normalscale glsl-vs-normalscale.c)
+add_executable (glsl-vs-functions glsl-vs-functions.c)
+add_executable (glsl-vs-texturematrix-1 glsl-vs-texturematrix-1.c)
+add_executable (glsl-vs-texturematrix-2 glsl-vs-texturematrix-2.c)
+add_executable (glsl-fs-pointcoord glsl-fs-pointcoord.c)
+add_executable (glsl-vs-if-bool glsl-vs-if-bool.c)
+add_executable (glsl-vs-loop glsl-vs-loop.c)
+add_executable (glsl-vs-loop-nested glsl-vs-loop-nested.c)
+IF (NOT MSVC)
+	add_executable (glsl-vs-raytrace-bug26691 glsl-vs-raytrace-bug26691.c)
+ENDIF (NOT MSVC)
+add_executable (glsl-vs-sqrt-zero glsl-vs-sqrt-zero.c)
+add_executable (glsl-vs-user-varying-ff glsl-vs-user-varying-ff.c)
+add_executable (glsl-light-model glsl-light-model.c)
+add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
+add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
+add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
+add_executable (glsl-link-initializer-01 glsl-link-initializer-01.c)
+add_executable (glsl-link-initializer-02 glsl-link-initializer-02.c)
+add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
+add_executable (glsl-link-initializer-04 glsl-link-initializer-04.c)
+add_executable (glsl-link-initializer-05 glsl-link-initializer-05.c)
+add_executable (glsl-link-initializer-06 glsl-link-initializer-06.c)
+add_executable (glsl-link-invariant-01 glsl-link-invariant-01.c)
+add_executable (glsl-link-centroid-01 glsl-link-centroid-01.c)
+add_executable (glsl-link-struct-array glsl-link-struct-array.c)
+add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
+add_executable (vp-address-01 vp-address-01.c)
+add_executable (vp-address-02 vp-address-02.c)
+add_executable (vp-address-03 vp-address-03.c)
+add_executable (vp-address-04 vp-address-04.c)
+add_executable (vp-address-05 vp-address-05.c)
+add_executable (vp-address-06 vp-address-06.c)
+add_executable (vp-bad-program vp-bad-program.c)
+add_executable (vp-combined-image-units vp-combined-image-units.c)
+add_executable (vp-clipdistance-01 vp-clipdistance-01.c)
+add_executable (vp-clipdistance-02 vp-clipdistance-02.c)
+add_executable (vp-clipdistance-03 vp-clipdistance-03.c)
+add_executable (vp-clipdistance-04 vp-clipdistance-04.c)
+add_executable (vpfp-generic vpfp-generic.cpp)
+add_executable (vp-max-array vp-max-array.c)
+add_executable (glsl-derivs glsl-derivs.c)
+add_executable (glsl-deriv-varyings glsl-deriv-varyings.c)
+add_executable (glsl-fs-discard-02 glsl-fs-discard-02.c)
+add_executable (glsl-fwidth glsl-fwidth.c)
+add_executable (glsl-lod-bias glsl-lod-bias.c)
+add_executable (glsl-preprocessor-comments glsl-preprocessor-comments.c)
+add_executable (vp-ignore-input vp-ignore-input.c)
+add_executable (glsl-empty-vs-no-fs glsl-empty-vs-no-fs.c)
+add_executable (glsl-mat-attribute glsl-mat-attribute.c)
+add_executable (glsl-max-varyings glsl-max-varyings.c)
+add_executable (glsl-useprogram-displaylist glsl-useprogram-displaylist.c)
+add_executable (glsl-routing glsl-routing.c)
+add_executable (shader_runner shader_runner.c)
+add_executable (glsl-vs-point-size glsl-vs-point-size.c)
+add_executable (glsl-sin glsl-sin.c)
+IF (UNIX)
+	target_link_libraries(glsl-sin m)
+ENDIF (UNIX)
+add_executable (glsl-cos glsl-cos.c)
+IF (UNIX)
+	target_link_libraries(glsl-cos m)
+ENDIF (UNIX)
+add_executable (glsl-kwin-blur-1 glsl-kwin-blur-1.c)
+add_executable (glsl-kwin-blur-2 glsl-kwin-blur-2.c)
+add_executable (link-mismatch-layout-01 link-mismatch-layout-01.c)
+add_executable (link-mismatch-layout-02 link-mismatch-layout-02.c)
+add_executable (link-mismatch-layout-03 link-mismatch-layout-03.c)
+add_executable (link-unresolved-function link-unresolved-function.c)
+add_executable (sso-simple sso-simple.c)
+add_executable (sso-uniforms-01 sso-uniforms-01.c)
+add_executable (sso-uniforms-02 sso-uniforms-02.c)
+add_executable (sso-user-varying-01 sso-user-varying-01.c)
+add_executable (sso-user-varying-02 sso-user-varying-02.c)
+add_executable (useprogram-flushverts-1 useprogram-flushverts-1.c)
+add_executable (useprogram-flushverts-2 useprogram-flushverts-2.c)
+add_executable (useprogram-inside-begin useprogram-inside-begin.c)
+add_executable (useprogram-refcount-1 useprogram-refcount-1.c)
+add_executable (useshaderprogram-bad-type useshaderprogram-bad-type.c)
+add_executable (useshaderprogram-bad-program useshaderprogram-bad-program.c)
+add_executable (useshaderprogram-flushverts-1 useshaderprogram-flushverts-1.c)
+
+# vim: ft=cmake:
diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt
index bd885f9c0..144a306f4 100644
--- a/tests/shaders/CMakeLists.txt
+++ b/tests/shaders/CMakeLists.txt
@@ -1,174 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (activeprogram-bad-program activeprogram-bad-program.c)
-add_executable (activeprogram-get activeprogram-get.c)
-add_executable (ati-fs-bad-delete ati-fs-bad-delete.c)
-add_executable (attribute0 attribute0.c)
-add_executable (createshaderprogram-bad-type createshaderprogram-bad-type.c)
-add_executable (createshaderprogram-attached-shaders createshaderprogram-attached-shaders.c)
-add_executable (trinity-fp1 trinity-fp1.c)
-add_executable (fp-abs-01 fp-abs-01.c)
-add_executable (fp-abs-02 fp-abs-02.c)
-add_executable (fp-condition_codes-01 fp-condition_codes-01.c)
-add_executable (fp-lit-mask fp-lit-mask.c)
-add_executable (fp-fog fp-fog.c)
-add_executable (fp-formats fp-formats.c)
-add_executable (fp-fragment-position fp-fragment-position.c)
-add_executable (fp-generic fp-generic.c)
-add_executable (fp-kil fp-kil.c)
-add_executable (fp-incomplete-tex fp-incomplete-tex.c)
-add_executable (fp-indirections fp-indirections.c)
-add_executable (fp-indirections2 fp-indirections2.c)
-add_executable (fp-long-alu fp-long-alu.c)
-add_executable (fp-rfl fp-rfl.c)
-IF (UNIX)
-	target_link_libraries(fp-rfl m)
-ENDIF (UNIX)
-add_executable (fp-set-01 fp-set-01.c)
-add_executable (fp-set-02 fp-set-02.c)
-add_executable (fp-unpack-01 fp-unpack-01.c)
-IF (UNIX)
-	target_link_libraries(fp-unpack-01 m)
-ENDIF (UNIX)
-add_executable (glsl-arb-fragment-coord-conventions glsl-arb-fragment-coord-conventions.c)
-add_executable (glsl-arb-fragment-coord-conventions-define glsl-arb-fragment-coord-conventions-define.c)
-add_executable (glsl-bindattriblocation glsl-bindattriblocation.c)
-add_executable (glsl-bug-22603 glsl-bug-22603.c)
-add_executable (glsl-dlist-getattriblocation glsl-dlist-getattriblocation.c)
-add_executable (glsl-explicit-location-01 glsl-explicit-location-01.c)
-add_executable (glsl-explicit-location-02 glsl-explicit-location-02.c)
-add_executable (glsl-explicit-location-03 glsl-explicit-location-03.c)
-add_executable (glsl-explicit-location-04 glsl-explicit-location-04.c)
-add_executable (glsl-explicit-location-05 glsl-explicit-location-05.c)
-add_executable (glsl-getattriblocation glsl-getattriblocation.c)
-add_executable (glsl-getactiveuniform-array-size glsl-getactiveuniform-array-size.c)
-add_executable (glsl-getactiveuniform-count glsl-getactiveuniform-count.c)
-add_executable (glsl-getactiveuniform-length glsl-getactiveuniform-length.c)
-add_executable (getuniform-01 getuniform-01.c)
-add_executable (glsl-invalid-asm-01 glsl-invalid-asm-01.c)
-add_executable (glsl-invalid-asm-02 glsl-invalid-asm-02.c)
-add_executable (glsl-novertexdata glsl-novertexdata.c)
-add_executable (glsl-orangebook-ch06-bump glsl-orangebook-ch06-bump.c)
-add_executable (glsl-reload-source glsl-reload-source.c)
-add_executable (glsl-unused-varying glsl-unused-varying.c)
-add_executable (glsl-uniform-update glsl-uniform-update.c)
-add_executable (glsl-uniform-out-of-bounds glsl-uniform-out-of-bounds.c)
-add_executable (glsl-fs-bug25902 glsl-fs-bug25902.c)
-add_executable (glsl-fs-color-matrix glsl-fs-color-matrix.c)
-add_executable (glsl-fs-exp2 glsl-fs-exp2.c)
-add_executable (glsl-fs-flat-color glsl-fs-flat-color.c)
-add_executable (glsl-fs-fragcoord glsl-fs-fragcoord.c)
-add_executable (glsl-fs-loop glsl-fs-loop.c)
-add_executable (glsl-fs-loop-nested glsl-fs-loop-nested.c)
-add_executable (glsl-fs-mix glsl-fs-mix.c)
-add_executable (glsl-fs-mix-constant glsl-fs-mix-constant.c)
-IF (NOT MSVC)
-	add_executable (glsl-fs-raytrace-bug27060 glsl-fs-raytrace-bug27060.c)
-ENDIF (NOT MSVC)
-add_executable (glsl-fs-sampler-numbering glsl-fs-sampler-numbering.c)
-add_executable (glsl-fs-shader-stencil-export glsl-fs-shader-stencil-export.c)
-add_executable (glsl-fs-sqrt-branch glsl-fs-sqrt-branch.c)
-add_executable (glsl-fs-sqrt-zero glsl-fs-sqrt-zero.c)
-add_executable (glsl-fs-texturecube glsl-fs-texturecube.c)
-add_executable (glsl-fs-texturecube-2 glsl-fs-texturecube-2.c)
-add_executable (glsl-fs-texture2drect glsl-fs-texture2drect.c)
-add_executable (glsl-fs-texturelod-01 glsl-fs-texturelod-01.c)
-add_executable (glsl-fs-user-varying-ff glsl-fs-user-varying-ff.c)
-add_executable (glsl-vs-arrays glsl-vs-arrays.c)
-add_executable (glsl-vs-mov-after-deref glsl-vs-mov-after-deref.c)
-add_executable (glsl-vs-normalscale glsl-vs-normalscale.c)
-add_executable (glsl-vs-functions glsl-vs-functions.c)
-add_executable (glsl-vs-texturematrix-1 glsl-vs-texturematrix-1.c)
-add_executable (glsl-vs-texturematrix-2 glsl-vs-texturematrix-2.c)
-add_executable (glsl-fs-pointcoord glsl-fs-pointcoord.c)
-add_executable (glsl-vs-if-bool glsl-vs-if-bool.c)
-add_executable (glsl-vs-loop glsl-vs-loop.c)
-add_executable (glsl-vs-loop-nested glsl-vs-loop-nested.c)
-IF (NOT MSVC)
-	add_executable (glsl-vs-raytrace-bug26691 glsl-vs-raytrace-bug26691.c)
-ENDIF (NOT MSVC)
-add_executable (glsl-vs-sqrt-zero glsl-vs-sqrt-zero.c)
-add_executable (glsl-vs-user-varying-ff glsl-vs-user-varying-ff.c)
-add_executable (glsl-light-model glsl-light-model.c)
-add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
-add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
-add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
-add_executable (glsl-link-initializer-01 glsl-link-initializer-01.c)
-add_executable (glsl-link-initializer-02 glsl-link-initializer-02.c)
-add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
-add_executable (glsl-link-initializer-04 glsl-link-initializer-04.c)
-add_executable (glsl-link-initializer-05 glsl-link-initializer-05.c)
-add_executable (glsl-link-initializer-06 glsl-link-initializer-06.c)
-add_executable (glsl-link-invariant-01 glsl-link-invariant-01.c)
-add_executable (glsl-link-centroid-01 glsl-link-centroid-01.c)
-add_executable (glsl-link-struct-array glsl-link-struct-array.c)
-add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
-add_executable (vp-address-01 vp-address-01.c)
-add_executable (vp-address-02 vp-address-02.c)
-add_executable (vp-address-03 vp-address-03.c)
-add_executable (vp-address-04 vp-address-04.c)
-add_executable (vp-address-05 vp-address-05.c)
-add_executable (vp-address-06 vp-address-06.c)
-add_executable (vp-bad-program vp-bad-program.c)
-add_executable (vp-combined-image-units vp-combined-image-units.c)
-add_executable (vp-clipdistance-01 vp-clipdistance-01.c)
-add_executable (vp-clipdistance-02 vp-clipdistance-02.c)
-add_executable (vp-clipdistance-03 vp-clipdistance-03.c)
-add_executable (vp-clipdistance-04 vp-clipdistance-04.c)
-add_executable (vpfp-generic vpfp-generic.cpp)
-add_executable (vp-max-array vp-max-array.c)
-add_executable (glsl-derivs glsl-derivs.c)
-add_executable (glsl-deriv-varyings glsl-deriv-varyings.c)
-add_executable (glsl-fs-discard-02 glsl-fs-discard-02.c)
-add_executable (glsl-fwidth glsl-fwidth.c)
-add_executable (glsl-lod-bias glsl-lod-bias.c)
-add_executable (glsl-preprocessor-comments glsl-preprocessor-comments.c)
-add_executable (vp-ignore-input vp-ignore-input.c)
-add_executable (glsl-empty-vs-no-fs glsl-empty-vs-no-fs.c)
-add_executable (glsl-mat-attribute glsl-mat-attribute.c)
-add_executable (glsl-max-varyings glsl-max-varyings.c)
-add_executable (glsl-useprogram-displaylist glsl-useprogram-displaylist.c)
-add_executable (glsl-routing glsl-routing.c)
-add_executable (shader_runner shader_runner.c)
-add_executable (glsl-vs-point-size glsl-vs-point-size.c)
-add_executable (glsl-sin glsl-sin.c)
-IF (UNIX)
-	target_link_libraries(glsl-sin m)
-ENDIF (UNIX)
-add_executable (glsl-cos glsl-cos.c)
-IF (UNIX)
-	target_link_libraries(glsl-cos m)
-ENDIF (UNIX)
-add_executable (glsl-kwin-blur-1 glsl-kwin-blur-1.c)
-add_executable (glsl-kwin-blur-2 glsl-kwin-blur-2.c)
-add_executable (link-mismatch-layout-01 link-mismatch-layout-01.c)
-add_executable (link-mismatch-layout-02 link-mismatch-layout-02.c)
-add_executable (link-mismatch-layout-03 link-mismatch-layout-03.c)
-add_executable (link-unresolved-function link-unresolved-function.c)
-add_executable (sso-simple sso-simple.c)
-add_executable (sso-uniforms-01 sso-uniforms-01.c)
-add_executable (sso-uniforms-02 sso-uniforms-02.c)
-add_executable (sso-user-varying-01 sso-user-varying-01.c)
-add_executable (sso-user-varying-02 sso-user-varying-02.c)
-add_executable (useprogram-flushverts-1 useprogram-flushverts-1.c)
-add_executable (useprogram-flushverts-2 useprogram-flushverts-2.c)
-add_executable (useprogram-inside-begin useprogram-inside-begin.c)
-add_executable (useprogram-refcount-1 useprogram-refcount-1.c)
-add_executable (useshaderprogram-bad-type useshaderprogram-bad-type.c)
-add_executable (useshaderprogram-bad-program useshaderprogram-bad-program.c)
-add_executable (useshaderprogram-flushverts-1 useshaderprogram-flushverts-1.c)
-
+piglit_include_target_api()
diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
new file mode 100644
index 000000000..829b610fc
--- /dev/null
+++ b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
@@ -0,0 +1,25 @@
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (arb_color_buffer_float-getteximage getteximage.c)
+add_executable (arb_color_buffer_float-queries queries.c)
+add_executable (arb_color_buffer_float-readpixels readpixels.c)
+add_executable (arb_color_buffer_float-probepixel probepixel.c)
+add_executable (arb_color_buffer_float-drawpixels drawpixels.c)
+add_executable (arb_color_buffer_float-clear clear.c)
+add_executable (arb_color_buffer_float-render render.c)
+add_executable (arb_color_buffer_float-mrt mrt.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.txt b/tests/spec/arb_color_buffer_float/CMakeLists.txt
index f576e5400..144a306f4 100644
--- a/tests/spec/arb_color_buffer_float/CMakeLists.txt
+++ b/tests/spec/arb_color_buffer_float/CMakeLists.txt
@@ -1,23 +1 @@
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (arb_color_buffer_float-getteximage getteximage.c)
-add_executable (arb_color_buffer_float-queries queries.c)
-add_executable (arb_color_buffer_float-readpixels readpixels.c)
-add_executable (arb_color_buffer_float-probepixel probepixel.c)
-add_executable (arb_color_buffer_float-drawpixels drawpixels.c)
-add_executable (arb_color_buffer_float-clear clear.c)
-add_executable (arb_color_buffer_float-render render.c)
-add_executable (arb_color_buffer_float-mrt mrt.c)
+piglit_include_target_api()
diff --git a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
new file mode 100644
index 000000000..7d047f72e
--- /dev/null
+++ b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
@@ -0,0 +1,24 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/mesa/util
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (arb_es2_compatibility-depthrangef arb_es2_compatibility-depthrangef.c)
+add_executable (arb_es2_compatibility-drawbuffers arb_es2_compatibility-drawbuffers.c)
+add_executable (arb_es2_compatibility-maxvectors arb_es2_compatibility-maxvectors.c)
+add_executable (arb_es2_compatibility-releaseshadercompiler arb_es2_compatibility-releaseshadercompiler.c)
+add_executable (arb_es2_compatibility-shadercompiler arb_es2_compatibility-shadercompiler.c)
+add_executable (arb_es2_compatibility-getshaderprecisionformat arb_es2_compatibility-getshaderprecisionformat.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/arb_es2_compatibility/CMakeLists.txt b/tests/spec/arb_es2_compatibility/CMakeLists.txt
index 7bd16338f..144a306f4 100644
--- a/tests/spec/arb_es2_compatibility/CMakeLists.txt
+++ b/tests/spec/arb_es2_compatibility/CMakeLists.txt
@@ -1,22 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (arb_es2_compatibility-depthrangef arb_es2_compatibility-depthrangef.c)
-add_executable (arb_es2_compatibility-drawbuffers arb_es2_compatibility-drawbuffers.c)
-add_executable (arb_es2_compatibility-maxvectors arb_es2_compatibility-maxvectors.c)
-add_executable (arb_es2_compatibility-releaseshadercompiler arb_es2_compatibility-releaseshadercompiler.c)
-add_executable (arb_es2_compatibility-shadercompiler arb_es2_compatibility-shadercompiler.c)
-add_executable (arb_es2_compatibility-getshaderprecisionformat arb_es2_compatibility-getshaderprecisionformat.c)
+piglit_include_target_api()
diff --git a/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt b/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt
new file mode 100644
index 000000000..e0cb29668
--- /dev/null
+++ b/tests/spec/arb_shader_texture_lod/CMakeLists.gl.txt
@@ -0,0 +1,17 @@
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (arb_shader_texture_lod-texgrad texgrad.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/arb_shader_texture_lod/CMakeLists.txt b/tests/spec/arb_shader_texture_lod/CMakeLists.txt
index 04ae05958..144a306f4 100644
--- a/tests/spec/arb_shader_texture_lod/CMakeLists.txt
+++ b/tests/spec/arb_shader_texture_lod/CMakeLists.txt
@@ -1,15 +1 @@
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (arb_shader_texture_lod-texgrad texgrad.c)
+piglit_include_target_api()
diff --git a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
new file mode 100644
index 000000000..f2a142183
--- /dev/null
+++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
@@ -0,0 +1,18 @@
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (ati_envmap_bumpmap-bump bump.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/ati_envmap_bumpmap/CMakeLists.txt b/tests/spec/ati_envmap_bumpmap/CMakeLists.txt
index 59a34ed56..144a306f4 100644
--- a/tests/spec/ati_envmap_bumpmap/CMakeLists.txt
+++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.txt
@@ -1,16 +1 @@
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (ati_envmap_bumpmap-bump bump.c)
+piglit_include_target_api()
diff --git a/tests/spec/ext_fog_coord/CMakeLists.gl.txt b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
new file mode 100644
index 000000000..c51cf0d5f
--- /dev/null
+++ b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
@@ -0,0 +1,21 @@
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (ext_fog_coord-modes modes.c)
+IF (UNIX)
+	target_link_libraries (ext_fog_coord-modes m)
+ENDIF (UNIX)
+
+# vim: ft=cmake:
diff --git a/tests/spec/ext_fog_coord/CMakeLists.txt b/tests/spec/ext_fog_coord/CMakeLists.txt
index e976d923b..144a306f4 100644
--- a/tests/spec/ext_fog_coord/CMakeLists.txt
+++ b/tests/spec/ext_fog_coord/CMakeLists.txt
@@ -1,19 +1 @@
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (ext_fog_coord-modes modes.c)
-IF (UNIX)
-	target_link_libraries (ext_fog_coord-modes m)
-ENDIF (UNIX)
+piglit_include_target_api()
diff --git a/tests/texturing/CMakeLists.gl.txt b/tests/texturing/CMakeLists.gl.txt
new file mode 100644
index 000000000..b20ed1f0b
--- /dev/null
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -0,0 +1,71 @@
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+	${TIFF_LIBRARY}
+)
+
+add_executable (array-texture array-texture.c)
+add_executable (copytexsubimage copytexsubimage.c)
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	add_executable (crossbar crossbar.c)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+add_executable (cubemap cubemap.c)
+add_executable (depth-level-clamp depth-level-clamp.c)
+add_executable (gen-compressed-teximage gen-compressed-teximage.c)
+add_executable (gen-nonzero-unit gen-nonzero-unit.c)
+add_executable (gen-teximage gen-teximage.c)
+add_executable (gen-texsubimage gen-texsubimage.c)
+add_executable (getteximage-simple getteximage-simple.c)
+add_executable (levelclamp levelclamp.c)
+add_executable (lodbias lodbias.c)
+add_executable (lodclamp lodclamp.c)
+add_executable (lodclamp-between lodclamp-between.c)
+add_executable (lodclamp-between-max lodclamp-between-max.c)
+add_executable (mipmap-setup mipmap-setup.c)
+add_executable (rg-draw-pixels rg-draw-pixels.c)
+add_executable (rg-teximage-01 rg-teximage-01.c rg-teximage-common.c)
+add_executable (rg-teximage-02 rg-teximage-02.c rg-teximage-common.c)
+add_executable (rgtc-teximage-01 rgtc-teximage-01.c rg-teximage-common.c)
+add_executable (rgtc-teximage-02 rgtc-teximage-02.c rg-teximage-common.c)
+IF (UNIX)
+        target_link_libraries (rg-teximage-01 m)
+        target_link_libraries (rg-teximage-02 m)
+        target_link_libraries (rgtc-teximage-01 m)
+        target_link_libraries (rgtc-teximage-02 m)
+ENDIF (UNIX)
+add_executable (s3tc-teximage s3tc-teximage.c)
+add_executable (fxt1-teximage fxt1-teximage.c)
+add_executable (s3tc-texsubimage s3tc-texsubimage.c)
+add_executable (streaming-texture-leak streaming-texture-leak.c)
+add_executable (tex3d tex3d.c)
+add_executable (tex3d-maxsize tex3d-maxsize.c)
+add_executable (tex3d-npot tex3d-npot.c)
+add_executable (texdepth texdepth.c)
+add_executable (teximage-errors teximage-errors.c)
+add_executable (texrect-many texrect-many.c)
+add_executable (texredefine texredefine.c)
+add_executable (texture-integer texture-integer.c)
+add_executable (depth-tex-modes      depth-tex-modes.c depth-tex-modes-common.c)
+add_executable (depth-tex-modes-rg   depth-tex-modes-rg.c depth-tex-modes-common.c)
+add_executable (depth-tex-modes-glsl depth-tex-modes-glsl.c)
+add_executable (depth-tex-compare depth-tex-compare.c)
+add_executable (tex-border-1 tex-border-1.c)
+add_executable (tex-skipped-unit tex-skipped-unit.c)
+add_executable (tex-swizzle tex-swizzle.c)
+add_executable (tex-srgb tex-srgb.c)
+IF (UNIX)
+        target_link_libraries (tex-srgb m)
+ENDIF (UNIX)
+add_executable (texture-rg texture-rg.c)
+add_executable (texwrap texwrap.c)
+
+# vim: ft=cmake:
diff --git a/tests/texturing/CMakeLists.txt b/tests/texturing/CMakeLists.txt
index 061cba63f..144a306f4 100644
--- a/tests/texturing/CMakeLists.txt
+++ b/tests/texturing/CMakeLists.txt
@@ -1,69 +1 @@
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
-)
-
-link_libraries (
-	piglitutil
-	${OPENGL_gl_LIBRARY}
-	${OPENGL_glu_LIBRARY}
-	${GLUT_glut_LIBRARY}
-	${TIFF_LIBRARY}
-)
-
-add_executable (array-texture array-texture.c)
-add_executable (copytexsubimage copytexsubimage.c)
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	add_executable (crossbar crossbar.c)
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-add_executable (cubemap cubemap.c)
-add_executable (depth-level-clamp depth-level-clamp.c)
-add_executable (gen-compressed-teximage gen-compressed-teximage.c)
-add_executable (gen-nonzero-unit gen-nonzero-unit.c)
-add_executable (gen-teximage gen-teximage.c)
-add_executable (gen-texsubimage gen-texsubimage.c)
-add_executable (getteximage-simple getteximage-simple.c)
-add_executable (levelclamp levelclamp.c)
-add_executable (lodbias lodbias.c)
-add_executable (lodclamp lodclamp.c)
-add_executable (lodclamp-between lodclamp-between.c)
-add_executable (lodclamp-between-max lodclamp-between-max.c)
-add_executable (mipmap-setup mipmap-setup.c)
-add_executable (rg-draw-pixels rg-draw-pixels.c)
-add_executable (rg-teximage-01 rg-teximage-01.c rg-teximage-common.c)
-add_executable (rg-teximage-02 rg-teximage-02.c rg-teximage-common.c)
-add_executable (rgtc-teximage-01 rgtc-teximage-01.c rg-teximage-common.c)
-add_executable (rgtc-teximage-02 rgtc-teximage-02.c rg-teximage-common.c)
-IF (UNIX)
-        target_link_libraries (rg-teximage-01 m)
-        target_link_libraries (rg-teximage-02 m)
-        target_link_libraries (rgtc-teximage-01 m)
-        target_link_libraries (rgtc-teximage-02 m)
-ENDIF (UNIX)
-add_executable (s3tc-teximage s3tc-teximage.c)
-add_executable (fxt1-teximage fxt1-teximage.c)
-add_executable (s3tc-texsubimage s3tc-texsubimage.c)
-add_executable (streaming-texture-leak streaming-texture-leak.c)
-add_executable (tex3d tex3d.c)
-add_executable (tex3d-maxsize tex3d-maxsize.c)
-add_executable (tex3d-npot tex3d-npot.c)
-add_executable (texdepth texdepth.c)
-add_executable (teximage-errors teximage-errors.c)
-add_executable (texrect-many texrect-many.c)
-add_executable (texredefine texredefine.c)
-add_executable (texture-integer texture-integer.c)
-add_executable (depth-tex-modes      depth-tex-modes.c depth-tex-modes-common.c)
-add_executable (depth-tex-modes-rg   depth-tex-modes-rg.c depth-tex-modes-common.c)
-add_executable (depth-tex-modes-glsl depth-tex-modes-glsl.c)
-add_executable (depth-tex-compare depth-tex-compare.c)
-add_executable (tex-border-1 tex-border-1.c)
-add_executable (tex-skipped-unit tex-skipped-unit.c)
-add_executable (tex-swizzle tex-swizzle.c)
-add_executable (tex-srgb tex-srgb.c)
-IF (UNIX)
-        target_link_libraries (tex-srgb m)
-ENDIF (UNIX)
-add_executable (texture-rg texture-rg.c)
-add_executable (texwrap texwrap.c)
+piglit_include_target_api()
diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
new file mode 100644
index 000000000..1afd72599
--- /dev/null
+++ b/tests/util/CMakeLists.gl.txt
@@ -0,0 +1,67 @@
+add_definitions ( -DSOURCE_DIR="${piglit_SOURCE_DIR}/" )
+
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+	${piglit_SOURCE_DIR}/tests/util/glut_egl
+)
+
+set (UTIL_SOURCES
+	fdo-bitmap.c
+	piglit-shader.c
+	piglit-util.c
+	piglit-shared-util.c
+	shader-load.c
+	piglit-framework.c
+	glew.c
+)
+
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	add_definitions ( -DUSE_GLX )
+	add_library (piglitglxutil
+		    piglit-shader.c
+		    piglit-util.c
+		    piglit-shared-util.c
+		    piglit-glx-framework.c
+		    piglit-glx-util.c
+		    glew.c
+	)
+	set (UTIL_SOURCES
+		${UTIL_SOURCES}
+		piglit-glx-util.c
+	)
+
+	link_libraries (${X11_X11_LIB})
+
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+add_library (piglitutil
+	${UTIL_SOURCES}
+)
+
+if(UNIX)
+	target_link_libraries(piglitutil m)
+endif(UNIX)
+
+# Temporarily disable building GLES2 targets.
+#IF(OPENGL_egl_LIBRARY)
+#	add_subdirectory (glut_egl)
+#	add_library (piglitegl_gles2util
+#		    piglit-egl-gles2-framework.c
+#		    piglit-gles2-util.c
+#		    piglit-shared-util.c
+#	)
+#	add_library (piglitegl_glutil
+#		    fdo-bitmap.c
+#		    piglit-egl-gl-framework.c
+#		    piglit-util.c
+#		    piglit-shared-util.c
+#	)
+#	target_link_libraries(piglitegl_gles2util ${OPENGL_gles2_LIBRARY} piglitglutegl_x11)
+#	set_target_properties ( piglitegl_gles2util
+#				PROPERTIES COMPILE_DEFINITIONS "PIGLIT_GLES2")
+#	target_link_libraries(piglitegl_glutil ${OPENGL_gl_LIBRARY} piglitglutegl_x11)
+#ENDIF(OPENGL_egl_LIBRARY)
+
+# vim: ft=cmake:
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 4a32ff484..144a306f4 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -1,65 +1 @@
-add_definitions ( -DSOURCE_DIR="${piglit_SOURCE_DIR}/" )
-
-include_directories(
-	${OPENGL_INCLUDE_PATH}
-	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
-	${piglit_SOURCE_DIR}/tests/util/glut_egl
-)
-
-set (UTIL_SOURCES
-	fdo-bitmap.c
-	piglit-shader.c
-	piglit-util.c
-	piglit-shared-util.c
-	shader-load.c
-	piglit-framework.c
-	glew.c
-)
-
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-	add_definitions ( -DUSE_GLX )
-	add_library (piglitglxutil
-		    piglit-shader.c
-		    piglit-util.c
-		    piglit-shared-util.c
-		    piglit-glx-framework.c
-		    piglit-glx-util.c
-		    glew.c
-	)
-	set (UTIL_SOURCES
-		${UTIL_SOURCES}
-		piglit-glx-util.c
-	)
-
-	link_libraries (${X11_X11_LIB})
-
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-
-add_library (piglitutil
-	${UTIL_SOURCES}
-)
-
-if(UNIX)
-	target_link_libraries(piglitutil m)
-endif(UNIX)
-
-# Temporarily disable building GLES2 targets.
-#IF(OPENGL_egl_LIBRARY)
-#	add_subdirectory (glut_egl)
-#	add_library (piglitegl_gles2util
-#		    piglit-egl-gles2-framework.c
-#		    piglit-gles2-util.c
-#		    piglit-shared-util.c
-#	)
-#	add_library (piglitegl_glutil
-#		    fdo-bitmap.c
-#		    piglit-egl-gl-framework.c
-#		    piglit-util.c
-#		    piglit-shared-util.c
-#	)
-#	target_link_libraries(piglitegl_gles2util ${OPENGL_gles2_LIBRARY} piglitglutegl_x11)
-#	set_target_properties ( piglitegl_gles2util
-#				PROPERTIES COMPILE_DEFINITIONS "PIGLIT_GLES2")
-#	target_link_libraries(piglitegl_glutil ${OPENGL_gl_LIBRARY} piglitglutegl_x11)
-#ENDIF(OPENGL_egl_LIBRARY)
+piglit_include_target_api()