[Piglit] [PATCH v2] util/gl: link against OPENGL_gl_LIBRARY on waffle aware systems

Mark Janes mark.a.janes at intel.com
Wed Nov 26 10:45:42 PST 2014


This patch fixes all issues with linking piglit gl/gles tests.

Thanks for addressing it.

-Mark

Emil Velikov <emil.l.velikov at gmail.com> writes:

> Similar to the earlier patch for waffle-less (glut) builds. The need
> for this patch became apparent as we removed the libGL link dependency
> in waffle.
>
> v2: Try to handle both gl and gles*.
>
> Cc: Mark Janes <mark.a.janes at intel.com>
> Reported-by: Mark Janes <mark.a.janes at intel.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  tests/util/CMakeLists.txt | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
> index 98eedd0..b95ed2f 100644
> --- a/tests/util/CMakeLists.txt
> +++ b/tests/util/CMakeLists.txt
> @@ -83,6 +83,11 @@ if(PIGLIT_USE_WAFFLE)
>  	list(APPEND UTIL_GL_LIBS
>  		${WAFFLE_LDFLAGS}
>  	)
> +	IF(PIGLIT_BUILD_GLX_TESTS)
> +		list(APPEND UTIL_GL_LIBS
> +			${OPENGL_gl_LIBRARY}
> +		)
> +	ENDIF(PIGLIT_BUILD_GLX_TESTS)
>  else()
>  	list(APPEND UTIL_GL_SOURCES
>  		piglit-framework-gl/piglit_glut_framework.c
> -- 
> 2.1.3


More information about the Piglit mailing list