[Piglit] [PATCH 02/10] CMakeLists: do not unconditionally find OpenGL package

Daniel Kurtz djkurtz at chromium.org
Wed Jan 15 03:09:57 PST 2014


The OpenGL package provides libGL and (Desktop) OpenGL header files.
libGL actually provides two interfaces:
  GLX "window system layer" (as defined by glproto)
  Desktop GL "GL Context API"

For environments that do not use either GLX nor Desktop GL, there is no
reason to look for this package.  In fact, if OpenGL is not found, the
following cmake variables get set to "NOTFOUND":
  OPENGL_INCLUDE_DIR
  OPENGL_gl_LIBRARY

OPENGL_INCLUDE_DIR as NOTFOUND is a problem when building EGL tests and
the piglitutil_gles* libraries, since OPENGL_INCLUDE_DIR is the common
UTIL_GL_INCLUDES, which is in the list of included directories.  It would
be better if it just wasn't defined at all.

Similarly, OPENGL_gl_LIBRARY is linked to the egl_khr_create_context tests
to enable them to use EGL to create a Desktop GL context.  Again, if there
is no Desktop GL, it would probably be better to just not define it at all.

Signed-off-by: Daniel Kurtz <djkurtz at chromium.org>
---
 CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9bd393..6620b98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,6 @@ option(PIGLIT_BUILD_CL_TESTS "Build tests for OpenCL" OFF)
 
 if(PIGLIT_BUILD_GL_TESTS)
 	find_package(OpenGL REQUIRED)
-else()
-	find_package(OpenGL)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-- 
1.8.5.2



More information about the Piglit mailing list