diff options
68 files changed, 8 insertions, 67 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d4b5b2a0..7c31173e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,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 52d16d4a..1a53693b 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 d8c0007f..9ad43c56 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 5c1864e0..df621f21 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 1cea990f..32591a90 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 f3551443..44015a1c 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 12e2f9e5..95f8819c 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 224ab633..db23f317 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 c20bec74..789d84f9 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 832c4753..a64295ad 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 4af71efb..066a01bc 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 9d722607..8e090d86 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 b6a6381e..7b006d4f 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 a6a10670..b835e91a 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 f01bb02f..67c3efc1 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 a1d1f623..d037b7fb 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 ad2e7496..cc7ccddd 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 81b92302..bd4fa9b1 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 07d47e7c..cb5daf7a 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 72151348..10e8c9e4 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 9fa4a2f2..6c1099d4 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 3b9fec3c..c46f5ff1 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 03aa0d8d..858eaa79 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 c595d47f..24d50a59 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 9ed8636b..db1c966a 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 1d939baa..a7e1a21c 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 4e3a84a0..41804d5d 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 5cdc8c6a..6b5dc595 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 26b4682c..c8ba5c19 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 163d9649..20282f5e 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 5a9040da..d970c121 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 c3a4684b..1e819dd1 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 d2fb9998..f942756c 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 32b9a702..ac12fcd7 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 cacc0b7b..b81a32b0 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 2b265c30..7acb75bc 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 3bb8b957..7cc967a6 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 c138bd96..16ce10c9 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 6f3b342f..1d97f5be 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 755ba2c5..7bc722aa 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 1f5edf93..ec722619 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 7fd1cc12..a0fc8a1d 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 c6ff3746..9da52cd7 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 9c1125e9..9238694f 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 d425728a..3fd7132e 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 68f05515..345947f7 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 7f4b1891..8436db27 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 bc771e7e..e712e12f 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 235be734..5db44dca 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 9a4afbe1..ab8c53ae 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 5f44d23b..42d17ae2 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 433dc371..d3025f56 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 1e611c4e..68f94a97 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 273ed11c..f81cb73b 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 3ddd1371..02d3a865 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 8714e2a8..9da7eacb 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 aae66ee8..8f519856 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 28c9e002..150dd979 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 3b70207c..1d004c48 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 2ba2acd0..52f14710 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 175c5aa2..b3db9fd8 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 96d69250..5f7a40b4 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 da31a40d..ff94a546 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 eed856bd..ab37b2f6 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 2442844e..e68bc728 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 6e12cc01..8720ed0f 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 467ac19b..6a2cbe9b 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 96964d66..9fe98068 100644 --- a/tests/util/CMakeLists.txt +++ b/tests/util/CMakeLists.txt @@ -2,7 +2,8 @@ add_definitions(-DSOURCE_DIR="${piglit_SOURCE_DIR}/") include_directories( ${OPENGL_INCLUDE_PATH} - ${piglit_SOURCE_DIR}/tests/util + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} ) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") |