[Piglit] [PATCH 16/16] cmake: Make each libpiglitutil_gl* contain identical set of files

[Chad Versace]

There are no longer any source files in tests/util that are specific to
a particular OpenGL API. In other words, all OpenGL utility sources in
tests/util are now "common" and shared by all OpenGL APIs.

With the intent of eventually building exactly one libpiglitutil_gl,
this patch makes each of libpiglitutil_{gl,gles1,gles2,gles3} contain
the same set of source files.

This patch brings us one step closer to unifying Piglit's CMake files.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/util/CMakeLists.gl.txt    | 10 ----------
 tests/util/CMakeLists.gles2.txt |  8 --------
 tests/util/CMakeLists.gles3.txt |  7 -------
 tests/util/CMakeLists.txt       |  6 ++++++
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt
index ddc913c..34ad63e 100644
--- a/tests/util/CMakeLists.gl.txt
+++ b/tests/util/CMakeLists.gl.txt
@@ -1,13 +1,3 @@
-set(UTIL_GL_SOURCES
-	${UTIL_GL_SOURCES}
-	piglit-matrix.c
-	piglit-test-pattern.cpp
-	piglit-fbo.cpp
-	piglit-vbo.cpp
-	sized-internalformats.c
-	minmax-test.c
-	)
-
 include_directories(
 	${UTIL_GL_INCLUDES}
 	)
diff --git a/tests/util/CMakeLists.gles2.txt b/tests/util/CMakeLists.gles2.txt
index b3b6336..4342cf2 100644
--- a/tests/util/CMakeLists.gles2.txt
+++ b/tests/util/CMakeLists.gles2.txt
@@ -1,11 +1,3 @@
-set(UTIL_GL_SOURCES
-	${UTIL_GL_SOURCES}
-	piglit-vbo.cpp
-	piglit-dispatch.c
-	piglit-dispatch-init.c
-	minmax-test.c
-	)
-
 include_directories(
 	${UTIL_GL_INCLUDES}
 	)
diff --git a/tests/util/CMakeLists.gles3.txt b/tests/util/CMakeLists.gles3.txt
index 5043b48..fec284a 100644
--- a/tests/util/CMakeLists.gles3.txt
+++ b/tests/util/CMakeLists.gles3.txt
@@ -1,10 +1,3 @@
-list(APPEND UTIL_GL_SOURCES
-	minmax-test.c
-	piglit-dispatch.c
-	piglit-dispatch-init.c
-	piglit-vbo.cpp
-	)
-
 include_directories(
 	${UTIL_GL_INCLUDES}
 	)
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index c5143cb..b2a49ab 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -29,15 +29,21 @@ set(UTIL_GL_INCLUDES
 
 set(UTIL_GL_SOURCES
 	fdo-bitmap.c
+	minmax-test.c
 	piglit-dispatch.c
 	piglit-dispatch-init.c
+	piglit-fbo.cpp
+	piglit-matrix.c
+	piglit-test-pattern.cpp
 	piglit-util-gl.c
+	piglit-vbo.cpp
 	piglit-framework-gl.c
 	piglit-framework-gl/piglit_gl_framework.c
 	piglit-shader.c
 	piglit_ktx.c
 	rgb9e5.c
 	r11g11b10f.c
+	sized-internalformats.c
 	${CMAKE_BINARY_DIR}/tests/util/piglit-util-gl-enum-gen.c
 	)
 
-- 
2.0.0