Commit df3ad924 authored by Chad Versace's avatar Chad Versace

cmake: Relocate all GLUT directives into single location

Nearly all CMakeLists.gl.txt contained the following:
    include_directories(${GLUT_INCLUDE_DIR})
    link_libraries(${GLUT_glut_LIBRARY})

This patch relocates them to cmake/target_api/gl/CMakeLists.txt.
Reviewed-by: default avatarPauli Nieminen <pauli.nieminen@intel.com>
Reviewed-by: Jordan Justen's avatarJordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Anuj Phogat's avatarAnuj Phogat <anuj.phogat@gmail.com>
Signed-off-by: default avatarChad Versace <chad.versace@linux.intel.com>
parent f03240c7
......@@ -3,6 +3,12 @@ add_definitions(
-DUSE_OPENGL
-DUSE_GLUT
)
include_directories(
${GLUT_INCLUDE_DIR}
)
link_libraries(
${GLUT_glut_LIBRARY}
)
add_subdirectory(${piglit_SOURCE_DIR}/tests
${piglit_BINARY_DIR}/target_api/${piglit_target_api}/tests
)
......@@ -2,13 +2,11 @@
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (asmparsertest asmparsertest.c)
......
......@@ -2,7 +2,6 @@
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/mesa/util
)
......@@ -10,7 +9,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (crash-cubemap-order crash-cubemap-order.c)
......
......@@ -2,7 +2,6 @@
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
......@@ -10,7 +9,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${OPENGL_egl_LIBRARY}
${GLUT_glut_LIBRARY}
)
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
......
......@@ -2,7 +2,6 @@
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/mesa/util
)
......@@ -10,7 +9,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (fbo-1d fbo-1d.c)
......
......@@ -2,14 +2,12 @@
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (array-stride array-stride.c)
......
......@@ -11,7 +11,6 @@ ENDIF ()
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${TIFF_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/util
)
......@@ -93,7 +92,6 @@ target_link_libraries (glean
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${X11_X11_LIB}
${TIFF_LIBRARY}
${CARBON_LIBRARY}
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries(
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (glslparsertest glslparsertest.c)
......
......@@ -2,7 +2,6 @@
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
if(BUILD_GLX_TESTS)
......@@ -14,7 +13,6 @@ endif(BUILD_GLX_TESTS)
link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
IF(BUILD_GLX_TESTS)
......
......@@ -3,7 +3,6 @@ include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
piglit_add_library(hiz-util
......@@ -16,7 +15,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable(hiz-depth-stencil-test-fbo-d0-s8 hiz-depth-stencil-test-fbo-d0-s8.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${PNG_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/mesa/util
)
......@@ -9,7 +8,6 @@ include_directories(
link_libraries (
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${PNG_LIBRARIES}
mesautil
)
......
......@@ -2,14 +2,12 @@
include_directories (
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${PNG_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
${PNG_LIBRARIES}
)
add_definitions (
......
......@@ -2,7 +2,6 @@
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/mesa/util
)
......@@ -10,7 +9,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (glsl-max-vertex-attrib glsl-max-vertex-attrib.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (amd_seamless_cubemap_per_texture amd_seamless_cubemap_per_texture.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_blend_func_extended-bindfragdataindexed-invalid-parameters bindfragdataindexed-invalid-parameters.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/util
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_blend_func_extended-fbo-extended-blend fbo-extended-blend.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_color_buffer_float-getteximage getteximage.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (copy_buffer_coherency copy_buffer_coherency.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_debug_output-api_error api_error.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_draw_buffers-state_change state_change.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (draw-elements-instanced-base-vertex draw-elements-instanced-base-vertex.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/util
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_draw_instanced-dlist dlist.c)
......
......@@ -2,7 +2,6 @@
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/mesa/util
)
......@@ -10,7 +9,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_es2_compatibility-depthrangef arb_es2_compatibility-depthrangef.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_fragment_program-minmax minmax.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/mesa/util
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable(get-renderbuffer-internalformat get-renderbuffer-internalformat.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (instanced_arrays instanced_arrays.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (map_buffer_range_error_check map_buffer_range_error_check.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_multisample-beginend beginend.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/spec/arb_robustness
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_robustness_draw-vbo-bounds draw-vbo-bounds.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (sampler-objects sampler-objects.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_seamless_cubemap arb_seamless_cubemap.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_shader_objects-bindattriblocation-scratch-name bindattriblocation-scratch-name.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_shader_texture_lod-texgrad texgrad.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/util
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_texture_buffer_object-dlist dlist.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_texture_compression-internal-format-query internal-format-query.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_texture_float-texture-float-formats texture-float-formats.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_texture_storage-texture-storage texture-storage.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_transform_feedback2-draw-auto draw-auto.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/util
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
add_executable (arb_uniform_buffer_object-getuniformblockindex getuniformblockindex.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_vertex_buffer_object-elements-negative-offset elements-negative-offset.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (arb_vertex_program-getenv4d-with-error getenv4d-with-error.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (draw-vertices-2101010 draw-vertices-2101010.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (ati_draw_buffers-arbfp arbfp.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (ati_envmap_bumpmap-bump bump.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
${piglit_SOURCE_DIR}/tests/spec/arb_color_buffer_float
)
......@@ -9,7 +8,6 @@ link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (ext_fog_coord-modes modes.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (ext_framebuffer_multisample-accuracy common.cpp accuracy.cpp)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)
piglit_add_executable (ext_packed_depth_stencil-readpixels-24_8 readpixels-24_8.c)
......
include_directories(
${GLEXT_INCLUDE_DIR}
${OPENGL_INCLUDE_PATH}
${GLUT_INCLUDE_DIR}
)
link_libraries (
piglitutil
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${GLUT_glut_LIBRARY}
)