[Piglit] [PATCH] cmake: don't fail, on Linux, if X11 is not found

Mircea Gherzan mircea.gherzan at intel.com
Tue Feb 16 18:27:32 UTC 2016


If X11 is not found then GLX cannot be available, so just disable the
building of the OpenGL test instead of hardcoding libGL/GLX as a build
requirement. GLES tests are on by default on Linux, so the build still
makes sense.

Signed-off-by: Mircea Gherzan <mircea.gherzan at intel.com>
---
 CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 736677f..902ca3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,10 @@ option(PIGLIT_BUILD_GLES2_TESTS "Build tests for OpenGL ES2" ${PIGLIT_BUILD_GLES
 option(PIGLIT_BUILD_GLES3_TESTS "Build tests for OpenGL ES3" ${PIGLIT_BUILD_GLES_TESTS_DEFAULT})
 option(PIGLIT_BUILD_CL_TESTS "Build tests for OpenCL" OFF)
 
+if((NOT X11_FOUND) AND (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
+	set(PIGLIT_BUILD_GL_TESTS OFF)
+endif()
+
 if(PIGLIT_BUILD_GL_TESTS)
 	find_package(OpenGL REQUIRED)
 endif()
-- 
2.5.0



More information about the Piglit mailing list