[Piglit] [PATCH 1/2] cmake: Use piglit_add_executable instead of add_executable

Dylan Baker baker.dylan.c at gmail.com
Fri Apr 11 16:33:16 PDT 2014


Using add_executable prevents the compiled binary from being installed
when installing out of tree.

Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>
---
 tests/spec/arb_compute_shader/CMakeLists.gl.txt    |  4 +-
 .../arb_compute_shader/compiler/CMakeLists.gl.txt  |  2 +-
 .../arb_shader_atomic_counters/CMakeLists.gl.txt   | 24 ++++-----
 .../execution/CMakeLists.gl.txt                    |  2 +-
 .../arb_uniform_buffer_object/CMakeLists.gl.txt    | 60 +++++++++++-----------
 tests/spec/glsl-1.40/CMakeLists.gl.txt             |  2 +-
 6 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/tests/spec/arb_compute_shader/CMakeLists.gl.txt b/tests/spec/arb_compute_shader/CMakeLists.gl.txt
index 9202761..a3367a7 100644
--- a/tests/spec/arb_compute_shader/CMakeLists.gl.txt
+++ b/tests/spec/arb_compute_shader/CMakeLists.gl.txt
@@ -10,7 +10,7 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
-add_executable (arb_compute_shader-api_errors api_errors.c)
-add_executable (arb_compute_shader-minmax minmax.c)
+piglit_add_executable (arb_compute_shader-api_errors api_errors.c)
+piglit_add_executable (arb_compute_shader-minmax minmax.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt b/tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt
index f96a656..22a7162 100644
--- a/tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt
+++ b/tests/spec/arb_compute_shader/compiler/CMakeLists.gl.txt
@@ -10,6 +10,6 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
-add_executable (arb_compute_shader-work_group_size_too_large work_group_size_too_large.c)
+piglit_add_executable (arb_compute_shader-work_group_size_too_large work_group_size_too_large.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt b/tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt
index 42c4eac..0f678d1 100644
--- a/tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_atomic_counters/CMakeLists.gl.txt
@@ -10,17 +10,17 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
-add_executable (arb_shader_atomic_counters-active-counters active-counters.c common.c)
-add_executable (arb_shader_atomic_counters-array-indexing array-indexing.c common.c)
-add_executable (arb_shader_atomic_counters-buffer-binding buffer-binding.c common.c)
-add_executable (arb_shader_atomic_counters-default-partition default-partition.c common.c)
-add_executable (arb_shader_atomic_counters-fragment-discard fragment-discard.c common.c)
-add_executable (arb_shader_atomic_counters-function-argument function-argument.c common.c)
-add_executable (arb_shader_atomic_counters-max-counters max-counters.c common.c)
-add_executable (arb_shader_atomic_counters-minmax minmax.c common.c)
-add_executable (arb_shader_atomic_counters-multiple-defs multiple-defs.c common.c)
-add_executable (arb_shader_atomic_counters-semantics semantics.c common.c)
-add_executable (arb_shader_atomic_counters-unique-id unique-id.c common.c)
-add_executable (arb_shader_atomic_counters-unused-result unused-result.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-active-counters active-counters.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-array-indexing array-indexing.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-buffer-binding buffer-binding.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-default-partition default-partition.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-fragment-discard fragment-discard.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-function-argument function-argument.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-max-counters max-counters.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-minmax minmax.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-multiple-defs multiple-defs.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-semantics semantics.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-unique-id unique-id.c common.c)
+piglit_add_executable (arb_shader_atomic_counters-unused-result unused-result.c common.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt b/tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt
index 3d5823b..8166163 100644
--- a/tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_shading_language_420pack/execution/CMakeLists.gl.txt
@@ -10,6 +10,6 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
-add_executable (arb_shading_language_420pack-multiple-layout-qualifiers multiple-layout-qualifiers.c)
+piglit_add_executable (arb_shading_language_420pack-multiple-layout-qualifiers multiple-layout-qualifiers.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
index b088ab4..685c415 100644
--- a/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_uniform_buffer_object/CMakeLists.gl.txt
@@ -10,35 +10,35 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
-add_executable (arb_uniform_buffer_object-bindbuffer-general-point bindbuffer-general-point.c)
-add_executable (arb_uniform_buffer_object-buffer-targets buffer-targets.c)
-add_executable (arb_uniform_buffer_object-deletebuffers deletebuffers.c)
-add_executable (arb_uniform_buffer_object-dlist dlist.c)
-add_executable (arb_uniform_buffer_object-getactiveuniformblockiv-uniform-block-data-size getactiveuniformblockiv-uniform-block-data-size.c uniform-types.c)
-add_executable (arb_uniform_buffer_object-getactiveuniformblockname getactiveuniformblockname.c)
-add_executable (arb_uniform_buffer_object-getactiveuniformname getactiveuniformname.c)
-add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-array-stride getactiveuniformsiv-uniform-array-stride.c)
-add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-block-index getactiveuniformsiv-uniform-block-index.c)
-add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-matrix-stride getactiveuniformsiv-uniform-matrix-stride.c)
-add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-type getactiveuniformsiv-uniform-type.c uniform-types.c)
-add_executable (arb_uniform_buffer_object-getintegeri_v getintegeri_v.c)
-add_executable (arb_uniform_buffer_object-getprogramiv getprogramiv.c)
-add_executable (arb_uniform_buffer_object-getuniformblockindex getuniformblockindex.c)
-add_executable (arb_uniform_buffer_object-getuniformindices getuniformindices.c)
-add_executable (arb_uniform_buffer_object-getuniformlocation getuniformlocation.c)
-add_executable (arb_uniform_buffer_object-layout-std140 layout-std140.c)
-add_executable (arb_uniform_buffer_object-layout-std140-base-size-and-alignment layout-std140-base-size-and-alignment.c uniform-types.c)
-add_executable (arb_uniform_buffer_object-link-mismatch-blocks link-mismatch-blocks.c)
-add_executable (arb_uniform_buffer_object-maxblocks maxblocks.c)
-add_executable (arb_uniform_buffer_object-maxuniformblocksize maxuniformblocksize.c)
-add_executable (arb_uniform_buffer_object-minmax minmax.c)
-add_executable (arb_uniform_buffer_object-negative-bindbuffer-index negative-bindbuffer-index.c)
-add_executable (arb_uniform_buffer_object-negative-bindbuffer-target negative-bindbuffer-target.c)
-add_executable (arb_uniform_buffer_object-negative-bindbufferrange-range negative-bindbufferrange-range.c)
-add_executable (arb_uniform_buffer_object-negative-getactiveuniformblockiv negative-getactiveuniformblockiv.c)
-add_executable (arb_uniform_buffer_object-negative-getactiveuniformsiv negative-getactiveuniformsiv.c)
-add_executable (arb_uniform_buffer_object-referenced-by-shader referenced-by-shader.c)
-add_executable (arb_uniform_buffer_object-row-major row-major.c)
-add_executable (arb_uniform_buffer_object-uniformblockbinding uniformblockbinding.c)
+piglit_add_executable (arb_uniform_buffer_object-bindbuffer-general-point bindbuffer-general-point.c)
+piglit_add_executable (arb_uniform_buffer_object-buffer-targets buffer-targets.c)
+piglit_add_executable (arb_uniform_buffer_object-deletebuffers deletebuffers.c)
+piglit_add_executable (arb_uniform_buffer_object-dlist dlist.c)
+piglit_add_executable (arb_uniform_buffer_object-getactiveuniformblockiv-uniform-block-data-size getactiveuniformblockiv-uniform-block-data-size.c uniform-types.c)
+piglit_add_executable (arb_uniform_buffer_object-getactiveuniformblockname getactiveuniformblockname.c)
+piglit_add_executable (arb_uniform_buffer_object-getactiveuniformname getactiveuniformname.c)
+piglit_add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-array-stride getactiveuniformsiv-uniform-array-stride.c)
+piglit_add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-block-index getactiveuniformsiv-uniform-block-index.c)
+piglit_add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-matrix-stride getactiveuniformsiv-uniform-matrix-stride.c)
+piglit_add_executable (arb_uniform_buffer_object-getactiveuniformsiv-uniform-type getactiveuniformsiv-uniform-type.c uniform-types.c)
+piglit_add_executable (arb_uniform_buffer_object-getintegeri_v getintegeri_v.c)
+piglit_add_executable (arb_uniform_buffer_object-getprogramiv getprogramiv.c)
+piglit_add_executable (arb_uniform_buffer_object-getuniformblockindex getuniformblockindex.c)
+piglit_add_executable (arb_uniform_buffer_object-getuniformindices getuniformindices.c)
+piglit_add_executable (arb_uniform_buffer_object-getuniformlocation getuniformlocation.c)
+piglit_add_executable (arb_uniform_buffer_object-layout-std140 layout-std140.c)
+piglit_add_executable (arb_uniform_buffer_object-layout-std140-base-size-and-alignment layout-std140-base-size-and-alignment.c uniform-types.c)
+piglit_add_executable (arb_uniform_buffer_object-link-mismatch-blocks link-mismatch-blocks.c)
+piglit_add_executable (arb_uniform_buffer_object-maxblocks maxblocks.c)
+piglit_add_executable (arb_uniform_buffer_object-maxuniformblocksize maxuniformblocksize.c)
+piglit_add_executable (arb_uniform_buffer_object-minmax minmax.c)
+piglit_add_executable (arb_uniform_buffer_object-negative-bindbuffer-index negative-bindbuffer-index.c)
+piglit_add_executable (arb_uniform_buffer_object-negative-bindbuffer-target negative-bindbuffer-target.c)
+piglit_add_executable (arb_uniform_buffer_object-negative-bindbufferrange-range negative-bindbufferrange-range.c)
+piglit_add_executable (arb_uniform_buffer_object-negative-getactiveuniformblockiv negative-getactiveuniformblockiv.c)
+piglit_add_executable (arb_uniform_buffer_object-negative-getactiveuniformsiv negative-getactiveuniformsiv.c)
+piglit_add_executable (arb_uniform_buffer_object-referenced-by-shader referenced-by-shader.c)
+piglit_add_executable (arb_uniform_buffer_object-row-major row-major.c)
+piglit_add_executable (arb_uniform_buffer_object-uniformblockbinding uniformblockbinding.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/glsl-1.40/CMakeLists.gl.txt b/tests/spec/glsl-1.40/CMakeLists.gl.txt
index 66a64a7..1f9a795 100644
--- a/tests/spec/glsl-1.40/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.40/CMakeLists.gl.txt
@@ -11,6 +11,6 @@ link_libraries (
 	${OPENGL_glu_LIBRARY}
 )
 
-add_executable (glsl-1.40-tf-no-position tf-no-position.c)
+piglit_add_executable (glsl-1.40-tf-no-position tf-no-position.c)
 
 # vim: ft=cmake:
-- 
1.9.2



More information about the Piglit mailing list