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.
Signed-off-by: Chad Versace <[email protected]> --- tests/util/CMakeLists.gles1.txt | 1 + tests/util/CMakeLists.gles2.txt | 1 + tests/util/CMakeLists.txt | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/util/CMakeLists.gles1.txt b/tests/util/CMakeLists.gles1.txt index 09dff85..58cc67a 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 e482ba7..3df0f6b 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 a4784b1..cbcf050 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 -- 1.7.11.7 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
