[Piglit] [PATCH 06/18] cmake: Add option USE_WAFFLE

Chad Versace chad.versace at linux.intel.com
Tue May 22 18:01:46 PDT 2012


If enabled, Piglit will use Waffle in place of GLUT. The option is
disabled by default.

As of this patch, however, enabling this option does nothing but require
libwaffle. Future patches will integrate Waffl into Piglit.

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 CMakeLists.txt |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6774a7e..3c2b99a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,14 @@ find_package(X11)
 option(BUILD_GLES1_TESTS "Build tests for OpenGL ES1" OFF)
 option(BUILD_GLES2_TESTS "Build tests for OpenGL ES2" OFF)
 
+option(USE_WAFFLE "Use Waffle in place of GLUT" OFF)
+if(USE_WAFFLE)
+	# FIXME: Specify version requirements for Waffle.
+	find_package(Waffle REQUIRED)
+	add_definitions(-DUSE_WAFFLE)
+	include_directories("${WAFFLE_INCLUDE_DIR}")
+endif(USE_WAFFLE)
+
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	option(BUILD_GLX_TESTS "Build tests that require GLX" ON)
 ELSE()
-- 
1.7.10.1



More information about the Piglit mailing list