[Piglit] [PATCH] Fix a cmake issue with compiling the oes base_vertex tests.

[Dylan Baker]

Quoting Ryan Houdek (2016-02-11 22:48:53)
> In a GLES only build this would fail to compile
> ---
>  .../spec/oes_draw_elements_base_vertex/CMakeLists.gles2.txt  | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/tests/spec/oes_draw_elements_base_vertex/CMakeLists.gles2.txt b/tests/spec/oes_draw_elements_base_vertex/CMakeLists.gles2.txt
> index bd50394..29cc8a0 100644
> --- a/tests/spec/oes_draw_elements_base_vertex/CMakeLists.gles2.txt
> +++ b/tests/spec/oes_draw_elements_base_vertex/CMakeLists.gles2.txt
> @@ -1,14 +1,8 @@
> -include_directories(
> -       ${GLEXT_INCLUDE_DIR}
> -       ${OPENGL_INCLUDE_PATH}
> -)
> -
> -link_libraries (
> -       piglitutil_${piglit_target_api}
> -       ${OPENGL_gl_LIBRARY}
> -)
> +link_libraries(piglitutil_${piglit_target_api})
>  
>  piglit_add_executable (oes_draw_elements_base_vertex-drawelements drawelements.c)
>  piglit_add_executable (oes_draw_elements_base_vertex-drawrangeelements drawrangeelements.c)
>  piglit_add_executable (oes_draw_elements_base_vertex-drawelements-instanced drawelements-instanced.c)
>  piglit_add_executable (oes_draw_elements_base_vertex-multidrawelements multidrawelements.c)
> +
> +# vim: ft=cmake:
> -- 
> 2.5.0
> 
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit

Hey Ryan,

I looked at some of the other OES extensions, and all of the ones I
looked at have something like this (All of the other gles2 CMake files
do, but the gles1 are a little all over the place):

"""
include_directories(
    ${GLEXT_INCLUDE_DIR}
    ${OPENGL_INCLUDE_PATH}
)
link_libraries(piglitutil_${piglit_target_api})
"""

Do we need to keep the include_directories, and just fix the
link_libraries? I can't find a single instance of linking against
OPGNEL_gl_LIBRARY in another gles test.

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/piglit/attachments/20160212/0f3fbdc7/attachment.sig>