[Piglit] [PATCH] cmake: Give an early error message when the required make.template module is not available.

jfonseca at vmware.com jfonseca at vmware.com
Wed Jun 13 01:47:43 PDT 2012


From: José Fonseca <jfonseca at vmware.com>

---
 CMakeLists.txt |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7202417..0aad196 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,16 +76,24 @@ if(NOT DEFINED python)
 	message(FATAL_ERROR "python version 2.x (where x >= 6) required")
 endif(NOT DEFINED python)
 
-# Check for the presence of numpy, which is needed to build generated
-# tests.
+# Check for the presence of several python packages, which are needed to build
+# generated tests.
 execute_process(
 	COMMAND ${python} -c "import numpy"
 	OUTPUT_QUIET
 	ERROR_QUIET
 	RESULT_VARIABLE import_numpy_error_code)
 if(NOT import_numpy_error_code EQUAL 0)
-	message(FATAL_ERROR "numpy library not found")
+	message(FATAL_ERROR "numpy python module not found")
 endif(NOT import_numpy_error_code EQUAL 0)
+execute_process(
+	COMMAND ${python} -c "from mako.template import Template"
+	OUTPUT_QUIET
+	ERROR_QUIET
+	RESULT_VARIABLE import_mako_error_code)
+if(NOT import_mako_error_code EQUAL 0)
+	message(FATAL_ERROR "mako.template python module not found")
+endif(NOT import_mako_error_code EQUAL 0)
 
 # Default to compiling with debug information (`gcc -g`):
 if(NOT CMAKE_BUILD_TYPE)
-- 
1.7.10



More information about the Piglit mailing list