<div dir="ltr">On 26 August 2013 11:43, Jacob Penner <<a href="mailto:jkpenner91@gmail.com" target="_blank">jkpenner91@gmail.com</a>> wrote: <div class="gmail_extra"><div class="gmail_quote"> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Create new subdirectory: layered-rendering/ Add Tests: layered-rendering/blit.c layered-rendering/clear-color.c layered-rendering/framebuffer-layer-complete.c layered-rendering/framebuffertexture.c layered-rendering/framebuffertexture-buffer-textures.c layered-rendering/get-framebuffer-attachment-parameter.c layered-rendering/readpixels.c --- tests/spec/gl-3.2/CMakeLists.txt | 4 +++- tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt | 19 +++++++++++++++++++ tests/spec/gl-3.2/layered-rendering/CMakeLists.txt | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt create mode 100644 tests/spec/gl-3.2/layered-rendering/CMakeLists.txt diff --git a/tests/spec/gl-3.2/CMakeLists.txt b/tests/spec/gl-3.2/CMakeLists.txt index 4a012b9..035dff5 100644 --- a/tests/spec/gl-3.2/CMakeLists.txt +++ b/tests/spec/gl-3.2/CMakeLists.txt @@ -1 +1,3 @@ -piglit_include_target_api() \ No newline at end of file +add_subdirectory (layered-rendering) +piglit_include_target_api() + diff --git a/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt b/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt new file mode 100644 index 0000000..30406bc --- /dev/null +++ b/tests/spec/gl-3.2/layered-rendering/CMakeLists.gl.txt @@ -0,0 +1,19 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} +) + +piglit_add_executable (gl-3.2-layered-rendering-blit blit.c) +piglit_add_executable (gl-3.2-layered-rendering-clear-color clear-color.c) +piglit_add_executable (gl-3.2-layered-rendering-framebuffer-layer-complete framebuffer-layer-complete.c) +piglit_add_executable (gl-3.2-layered-rendering-framebuffertexture framebuffertexture.c) +piglit_add_executable (gl-3.2-layered-rendering-framebuffertexture-buffer-textures framebuffertexture-buffer-textures.c) +piglit_add_executable (gl-3.2-layered-rendering-get-framebuffer-attachment-parameter get-framebuffer-attachment-parameter.c) +piglit_add_executable (gl-3.2-layered-rendering-readpixels readpixels.c) +# vim: ft=cmake: diff --git a/tests/spec/gl-3.2/layered-rendering/CMakeLists.txt b/tests/spec/gl-3.2/layered-rendering/CMakeLists.txt new file mode 100644 index 0000000..144a306 --- /dev/null +++ b/tests/spec/gl-3.2/layered-rendering/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() -- 1.8.3.1 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div> </div><div class="gmail_extra">The additions to CMakeLists.gl.txt and all.tests can't be in their own patches like this. Patch 3 should add this new CMakeLists.txt file, containing the boilerplate code at the top, and just the piglit_add_executable line for blit.c. Patch 3 should also add just blit.c to all.tests. Patch 4 should add clear-color.c to CMakeLists.txt and to all.tests. And so on. That way each patch stands on its own, and piglit can be successfully built and run from any point in the middle of the patch series. </div></div>