[Piglit] [PATCH 18/23] cmake: On Linux, require Waffle by default

Chad Versace chad.versace at linux.intel.com
Fri Sep 28 10:45:04 PDT 2012

The new GL test framework, piglit_wfl_framework, requires Waffle.  Testers
should prefer to use that over piglit_glut_framework.

To quiet the angry mob, if CMake fails to find Waffle then it prints
a helpful message that points to Waffle's website.

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
 CMakeLists.txt | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c07075e..2e45b25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,9 +21,22 @@ option(PIGLIT_BUILD_GLES1_TESTS "Build tests for OpenGL ES1" OFF)
 option(PIGLIT_BUILD_GLES2_TESTS "Build tests for OpenGL ES2" OFF)
 option(PIGLIT_BUILD_CL_TESTS "Build tests for OpenCL" OFF)
-option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF)
+	option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" ON)
+	option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF)
 	pkg_check_modules(WAFFLE REQUIRED waffle-1>=1.0.1)
+		message(FATAL_ERROR "Failed to find Waffle. If Waffle is not "
+		"packaged for your distribution, you can get it at "
+		"http://people.freedesktop.org/~chadversary/waffle."
+	)
+        endif()

More information about the Piglit mailing list