[Piglit] [PATCH 1/4] don't write generated header to the source directory

nobled nobled at dreamwidth.org
Fri Mar 2 05:30:19 PST 2012


It was impossible to have the source directory read-only.

Also add the include_directories() directive for tests/util
in just one place, under tests/, so that all subdirectories
inherit it. A bunch of CMakeLists.txt files duplicate it,
so delete those redundant include flags.
---
 CMakeLists.txt                                     |    2 +-
 tests/CMakeLists.txt                               |    5 +++++
 tests/asmparsertest/CMakeLists.gl.txt              |    1 -
 tests/bugs/CMakeLists.gl.txt                       |    1 -
 tests/egl/CMakeLists.gl.txt                        |    1 -
 tests/fbo/CMakeLists.gl.txt                        |    1 -
 tests/general/CMakeLists.gl.txt                    |    1 -
 tests/gles2/CMakeLists.gles2.txt                   |    1 -
 tests/glx/CMakeLists.gl.txt                        |    1 -
 tests/hiz/CMakeLists.gl.txt                        |    1 -
 tests/mesa/util/CMakeLists.gl.txt                  |    1 -
 tests/shaders/CMakeLists.gl.txt                    |    1 -
 .../CMakeLists.gl.txt                              |    1 -
 .../arb_blend_func_extended/api/CMakeLists.gl.txt  |    1 -
 .../spec/arb_color_buffer_float/CMakeLists.gl.txt  |    1 -
 tests/spec/arb_copy_buffer/CMakeLists.gl.txt       |    1 -
 tests/spec/arb_debug_output/CMakeLists.gl.txt      |    1 -
 tests/spec/arb_draw_buffers/CMakeLists.gl.txt      |    1 -
 .../CMakeLists.gl.txt                              |    1 -
 tests/spec/arb_es2_compatibility/CMakeLists.gl.txt |    1 -
 tests/spec/arb_fragment_program/CMakeLists.gl.txt  |    1 -
 .../spec/arb_framebuffer_object/CMakeLists.gl.txt  |    1 -
 tests/spec/arb_instanced_arrays/CMakeLists.gl.txt  |    1 -
 tests/spec/arb_map_buffer_range/CMakeLists.gl.txt  |    1 -
 tests/spec/arb_multisample/CMakeLists.gl.txt       |    1 -
 tests/spec/arb_robustness/CMakeLists.gl.txt        |    1 -
 tests/spec/arb_sampler_objects/CMakeLists.gl.txt   |    1 -
 tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt |    1 -
 tests/spec/arb_shader_objects/CMakeLists.gl.txt    |    1 -
 .../execution/CMakeLists.gl.txt                    |    1 -
 .../spec/arb_texture_compression/CMakeLists.gl.txt |    1 -
 tests/spec/arb_texture_float/CMakeLists.gl.txt     |    1 -
 tests/spec/arb_texture_storage/CMakeLists.gl.txt   |    1 -
 .../spec/arb_transform_feedback2/CMakeLists.gl.txt |    1 -
 .../arb_vertex_buffer_object/CMakeLists.gl.txt     |    1 -
 tests/spec/arb_vertex_program/CMakeLists.gl.txt    |    1 -
 .../CMakeLists.gl.txt                              |    1 -
 tests/spec/ati_draw_buffers/CMakeLists.gl.txt      |    1 -
 tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt    |    1 -
 tests/spec/ext_fog_coord/CMakeLists.gl.txt         |    1 -
 .../ext_framebuffer_multisample/CMakeLists.gl.txt  |    1 -
 .../ext_packed_depth_stencil/CMakeLists.gl.txt     |    1 -
 tests/spec/ext_packed_float/CMakeLists.gl.txt      |    1 -
 tests/spec/ext_texture_array/CMakeLists.gl.txt     |    1 -
 tests/spec/ext_texture_integer/CMakeLists.gl.txt   |    1 -
 tests/spec/ext_timer_query/CMakeLists.gl.txt       |    1 -
 .../spec/ext_transform_feedback/CMakeLists.gl.txt  |    1 -
 tests/spec/gl-2.0/CMakeLists.gl.txt                |    1 -
 tests/spec/gl-2.0/api/CMakeLists.gl.txt            |    1 -
 tests/spec/gl-2.1/CMakeLists.gl.txt                |    1 -
 tests/spec/gl-3.0/CMakeLists.gl.txt                |    1 -
 tests/spec/gl-3.0/api/CMakeLists.gl.txt            |    1 -
 .../glsl-1.10/execution/clipping/CMakeLists.gl.txt |    1 -
 tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt   |    1 -
 tests/spec/glsl-1.30/CMakeLists.gl.txt             |    1 -
 tests/spec/glsl-1.30/execution/CMakeLists.gl.txt   |    1 -
 .../glsl-1.30/execution/clipping/CMakeLists.gl.txt |    1 -
 .../glsl-1.30/linker/clipping/CMakeLists.gl.txt    |    1 -
 .../spec/glx_arb_create_context/CMakeLists.gl.txt  |    1 -
 .../spec/glx_ext_import_context/CMakeLists.gl.txt  |    1 -
 tests/spec/nv_conditional_render/CMakeLists.gl.txt |    1 -
 tests/spec/nv_texture_barrier/CMakeLists.gl.txt    |    1 -
 .../CMakeLists.gles1.txt                           |    1 -
 .../CMakeLists.gles1.txt                           |    1 -
 tests/spec/oes_draw_texture/CMakeLists.gles1.txt   |    1 -
 tests/texturing/CMakeLists.gl.txt                  |    1 -
 tests/texturing/shaders/CMakeLists.gl.txt          |    1 -
 tests/util/CMakeLists.txt                          |    1 +
 68 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a00efc5..47c8b3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,7 +150,7 @@ check_include_file(fcntl.h     HAVE_FCNTL_H)

 configure_file(
 	"${piglit_SOURCE_DIR}/tests/util/config.h.in"
-	"${piglit_SOURCE_DIR}/tests/util/config.h"
+	"${piglit_BINARY_DIR}/tests/util/config.h"
 )

 include_directories(src)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 52d16d4..1a53693 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,8 @@
+include_directories(
+	${piglit_BINARY_DIR}/tests/util
+	${piglit_SOURCE_DIR}/tests/util
+)
+
 add_subdirectory (util)
 add_subdirectory (bugs)
 add_subdirectory (fbo)
diff --git a/tests/asmparsertest/CMakeLists.gl.txt
b/tests/asmparsertest/CMakeLists.gl.txt
index d8c0007..9ad43c5 100644
--- a/tests/asmparsertest/CMakeLists.gl.txt
+++ b/tests/asmparsertest/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index 5c1864e..df621f2 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/egl/CMakeLists.gl.txt b/tests/egl/CMakeLists.gl.txt
index 1cea990..32591a9 100644
--- a/tests/egl/CMakeLists.gl.txt
+++ b/tests/egl/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
index f355144..44015a1 100644
--- a/tests/fbo/CMakeLists.gl.txt
+++ b/tests/fbo/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index 12e2f9e..95f8819 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/gles2/CMakeLists.gles2.txt b/tests/gles2/CMakeLists.gles2.txt
index 224ab63..db23f31 100644
--- a/tests/gles2/CMakeLists.gles2.txt
+++ b/tests/gles2/CMakeLists.gles2.txt
@@ -2,7 +2,6 @@

 include_directories(
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util/
 	)

 link_libraries(
diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
index 157e820..4477585 100644
--- a/tests/glx/CMakeLists.gl.txt
+++ b/tests/glx/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/hiz/CMakeLists.gl.txt b/tests/hiz/CMakeLists.gl.txt
index 832c475..a64295a 100644
--- a/tests/hiz/CMakeLists.gl.txt
+++ b/tests/hiz/CMakeLists.gl.txt
@@ -1,6 +1,5 @@
 include_directories(
 	${piglit_SOURCE_DIR}/tests
-	${piglit_SOURCE_DIR}/tests/util

 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
diff --git a/tests/mesa/util/CMakeLists.gl.txt
b/tests/mesa/util/CMakeLists.gl.txt
index 4af71ef..066a01b 100644
--- a/tests/mesa/util/CMakeLists.gl.txt
+++ b/tests/mesa/util/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories (
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${PNG_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )
 link_libraries (
 	piglitutil
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index 9d72260..8e090d8 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
index b6a6381..7b006d4 100644
--- a/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
+++ b/tests/spec/amd_seamless_cubemap_per_texture/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
index a6a1067..b835e91 100644
--- a/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
+++ b/tests/spec/arb_blend_func_extended/api/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
index f01bb02..67c3efc 100644
--- a/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_color_buffer_float/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
index a1d1f62..d037b7f 100644
--- a/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
+++ b/tests/spec/arb_copy_buffer/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_debug_output/CMakeLists.gl.txt
b/tests/spec/arb_debug_output/CMakeLists.gl.txt
index ad2e749..cc7ccdd 100644
--- a/tests/spec/arb_debug_output/CMakeLists.gl.txt
+++ b/tests/spec/arb_debug_output/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
index 81b9230..bd4fa9b 100644
--- a/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_buffers/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
index ef5d4b0..19ac81d 100644
--- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
index 7215134..10e8c9e 100644
--- a/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
+++ b/tests/spec/arb_es2_compatibility/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_fragment_program/CMakeLists.gl.txt
b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
index 9fa4a2f..6c1099d 100644
--- a/tests/spec/arb_fragment_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_fragment_program/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
index 3b9fec3..c46f5ff 100644
--- a/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_framebuffer_object/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
index 03aa0d8..858eaa7 100644
--- a/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
+++ b/tests/spec/arb_instanced_arrays/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
index c595d47..24d50a5 100644
--- a/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
+++ b/tests/spec/arb_map_buffer_range/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_multisample/CMakeLists.gl.txt
b/tests/spec/arb_multisample/CMakeLists.gl.txt
index 9ed8636..db1c966 100644
--- a/tests/spec/arb_multisample/CMakeLists.gl.txt
+++ b/tests/spec/arb_multisample/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_robustness/CMakeLists.gl.txt
b/tests/spec/arb_robustness/CMakeLists.gl.txt
index 1d939ba..a7e1a21 100644
--- a/tests/spec/arb_robustness/CMakeLists.gl.txt
+++ b/tests/spec/arb_robustness/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_robustness
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
index 4e3a84a..41804d5 100644
--- a/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_sampler_objects/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
index 5cdc8c6..6b5dc59 100644
--- a/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
+++ b/tests/spec/arb_seamless_cube_map/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_shader_objects/CMakeLists.gl.txt
b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
index 26b4682..c8ba5c1 100644
--- a/tests/spec/arb_shader_objects/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_objects/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
index 163d964..20282f5 100644
--- a/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_shader_texture_lod/execution/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_texture_compression/CMakeLists.gl.txt
b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
index 5a9040d..d970c12 100644
--- a/tests/spec/arb_texture_compression/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_compression/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_texture_float/CMakeLists.gl.txt
b/tests/spec/arb_texture_float/CMakeLists.gl.txt
index c3a4684..1e819dd 100644
--- a/tests/spec/arb_texture_float/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_float/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_texture_storage/CMakeLists.gl.txt
b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
index d2fb999..f942756 100644
--- a/tests/spec/arb_texture_storage/CMakeLists.gl.txt
+++ b/tests/spec/arb_texture_storage/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
index 32b9a70..ac12fcd 100644
--- a/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
+++ b/tests/spec/arb_transform_feedback2/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
index cacc0b7..b81a32b 100644
--- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
index 2b265c3..7acb75b 100644
--- a/tests/spec/arb_vertex_program/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_program/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
b/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
index 3bb8b95..7cc967a 100644
--- a/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
index c138bd9..16ce10c 100644
--- a/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
+++ b/tests/spec/ati_draw_buffers/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
index 6f3b342..1d97f5b 100644
--- a/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
+++ b/tests/spec/ati_envmap_bumpmap/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ext_fog_coord/CMakeLists.gl.txt
b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
index 755ba2c..7bc722a 100644
--- a/tests/spec/ext_fog_coord/CMakeLists.gl.txt
+++ b/tests/spec/ext_fog_coord/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index 1f5edf9..ec72261 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
index 7fd1cc1..a0fc8a1 100644
--- a/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_depth_stencil/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ext_packed_float/CMakeLists.gl.txt
b/tests/spec/ext_packed_float/CMakeLists.gl.txt
index c6ff374..9da52cd 100644
--- a/tests/spec/ext_packed_float/CMakeLists.gl.txt
+++ b/tests/spec/ext_packed_float/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ext_texture_array/CMakeLists.gl.txt
b/tests/spec/ext_texture_array/CMakeLists.gl.txt
index 9c1125e..9238694 100644
--- a/tests/spec/ext_texture_array/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_array/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ext_texture_integer/CMakeLists.gl.txt
b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
index d425728..3fd7132 100644
--- a/tests/spec/ext_texture_integer/CMakeLists.gl.txt
+++ b/tests/spec/ext_texture_integer/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ext_timer_query/CMakeLists.gl.txt
b/tests/spec/ext_timer_query/CMakeLists.gl.txt
index 68f0551..345947f 100644
--- a/tests/spec/ext_timer_query/CMakeLists.gl.txt
+++ b/tests/spec/ext_timer_query/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
index 7f4b189..8436db2 100644
--- a/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
+++ b/tests/spec/ext_transform_feedback/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/gl-2.0/CMakeLists.gl.txt
b/tests/spec/gl-2.0/CMakeLists.gl.txt
index bc771e7..e712e12 100644
--- a/tests/spec/gl-2.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/gl-2.0/api/CMakeLists.gl.txt
b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
index 235be73..5db44dc 100644
--- a/tests/spec/gl-2.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/api/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/gl-2.1/CMakeLists.gl.txt
b/tests/spec/gl-2.1/CMakeLists.gl.txt
index 9a4afbe..ab8c53a 100644
--- a/tests/spec/gl-2.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.1/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/gl-3.0/CMakeLists.gl.txt
b/tests/spec/gl-3.0/CMakeLists.gl.txt
index 5f44d23..42d17ae 100644
--- a/tests/spec/gl-3.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/gl-3.0/api/CMakeLists.gl.txt
b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
index 433dc37..d3025f5 100644
--- a/tests/spec/gl-3.0/api/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
@@ -2,7 +2,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
index 1e611c4..68f94a9 100644
--- a/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.10/execution/clipping/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
index 273ed11..f81cb73 100644
--- a/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.20/recursion/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/glsl-1.30/CMakeLists.gl.txt
b/tests/spec/glsl-1.30/CMakeLists.gl.txt
index 3ddd137..02d3a86 100644
--- a/tests/spec/glsl-1.30/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
index 8714e2a..9da7eac 100644
--- a/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
index aae66ee..8f51985 100644
--- a/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/execution/clipping/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
index 28c9e00..150dd97 100644
--- a/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
+++ b/tests/spec/glsl-1.30/linker/clipping/CMakeLists.gl.txt
@@ -4,7 +4,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
index a9f8a31..a43bfbe 100644
--- a/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_arb_create_context/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
index 001ade9..aad44a3 100644
--- a/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
+++ b/tests/spec/glx_ext_import_context/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/nv_conditional_render/CMakeLists.gl.txt
b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
index 175c5aa..b3db9fd 100644
--- a/tests/spec/nv_conditional_render/CMakeLists.gl.txt
+++ b/tests/spec/nv_conditional_render/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
index 96d6925..5f7a40b 100644
--- a/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
+++ b/tests/spec/nv_texture_barrier/CMakeLists.gl.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
index da31a40..ff94a54 100644
--- a/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_compressed_etc1_rgb8_texture/CMakeLists.gles1.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries(
diff --git a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
index eed856b..ab37b2f 100644
--- a/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_compressed_paletted_texture/CMakeLists.gles1.txt
@@ -1,7 +1,6 @@
 include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries(
diff --git a/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
b/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
index 2442844..e68bc72 100644
--- a/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
+++ b/tests/spec/oes_draw_texture/CMakeLists.gles1.txt
@@ -2,7 +2,6 @@

 include_directories(
 	${OPENGL_INCLUDE_PATH}
-	${piglit_SOURCE_DIR}/tests/util/
 	)

 link_libraries(
diff --git a/tests/texturing/CMakeLists.gl.txt
b/tests/texturing/CMakeLists.gl.txt
index 6e12cc0..8720ed0 100644
--- a/tests/texturing/CMakeLists.gl.txt
+++ b/tests/texturing/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${GLEXT_INCLUDE_DIR}
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/texturing/shaders/CMakeLists.gl.txt
b/tests/texturing/shaders/CMakeLists.gl.txt
index 467ac19..6a2cbe9 100644
--- a/tests/texturing/shaders/CMakeLists.gl.txt
+++ b/tests/texturing/shaders/CMakeLists.gl.txt
@@ -3,7 +3,6 @@ include_directories(
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
 	${piglit_SOURCE_DIR}/tests/mesa/util
-	${piglit_SOURCE_DIR}/tests/util
 )

 link_libraries (
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 96964d6..a8d0373 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -2,6 +2,7 @@ add_definitions(-DSOURCE_DIR="${piglit_SOURCE_DIR}/")

 include_directories(
 	${OPENGL_INCLUDE_PATH}
+	${piglit_BINARY_DIR}/tests/util
 	${piglit_SOURCE_DIR}/tests/util
 )

-- 
1.7.4.1


More information about the Piglit mailing list