diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-11-27 16:03:34 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-11-29 17:08:01 -0800 |
| commit | dd7cd967c1fa7b17c914c775aa501825aeb5063a (patch) | |
| tree | 800408b57fea4cee81000ddbaae85be011eb8057 /tests/util | |
| parent | 80fd27841e17da68362ed1c50d897ef220898978 (diff) | |
cmake: Move piglit-util-gl-enum.c out of common UTIL_GL_SOURCES (v2)
In libpiglitutil_gles3, piglit-util-gl-enum.c will conflict with
piglit-util-gles3-enum.c. Therefore, require that each
test/util/CMakeLists.$api.txt add it to the sources list if needed.
v2: Add piglit-util-gl-enum.c to libpiglitutil_gl.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'tests/util')
| -rw-r--r-- | tests/util/CMakeLists.gl.txt | 1 | ||||
| -rw-r--r-- | tests/util/CMakeLists.gles1.txt | 1 | ||||
| -rw-r--r-- | tests/util/CMakeLists.gles2.txt | 1 | ||||
| -rw-r--r-- | tests/util/CMakeLists.txt | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt index a4e7dc68..10be17a5 100644 --- a/tests/util/CMakeLists.gl.txt +++ b/tests/util/CMakeLists.gl.txt @@ -4,6 +4,7 @@ set(UTIL_GL_SOURCES piglit-dispatch-init.c piglit-shader.c piglit-shader-gl.c + piglit-util-gl-enum.c piglit-util-gl.c piglit-vbo.cpp sized-internalformats.c diff --git a/tests/util/CMakeLists.gles1.txt b/tests/util/CMakeLists.gles1.txt index 09dff856..58cc67af 100644 --- a/tests/util/CMakeLists.gles1.txt +++ b/tests/util/CMakeLists.gles1.txt @@ -1,5 +1,6 @@ set(UTIL_GL_SOURCES ${UTIL_GL_SOURCES} + piglit-util-gl-enum.c piglit-util-gles.c ) diff --git a/tests/util/CMakeLists.gles2.txt b/tests/util/CMakeLists.gles2.txt index e482ba7d..3df0f6bf 100644 --- a/tests/util/CMakeLists.gles2.txt +++ b/tests/util/CMakeLists.gles2.txt @@ -2,6 +2,7 @@ set(UTIL_GL_SOURCES ${UTIL_GL_SOURCES} piglit-shader.c piglit-shader-gles2.c + piglit-util-gl-enum.c piglit-util-gles.c ) diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt index a4784b1d..cbcf050b 100644 --- a/tests/util/CMakeLists.txt +++ b/tests/util/CMakeLists.txt @@ -18,7 +18,6 @@ set(UTIL_GL_INCLUDES set(UTIL_GL_SOURCES fdo-bitmap.c piglit-util-gl-common.c - piglit-util-gl-enum.c piglit-framework-gl/piglit_gl_framework.c piglit-framework-gl.c piglit_ktx.c |