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

[Chad Versace]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 06/13/2012 01:47 AM, jfonseca at vmware.com wrote:
> 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)
> 


Reviewed-by: Chad Versace <chad.versace at linux.intel.com>


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJP2QDnAAoJEAIvNt057x8izhUP+gKaVvDAZm4qq0h+kuUkdRTO
elLdT7f6FKTl8fGV/2IJRbhjwU9ghhGSQgfhUEW231G0Rx3kTGTxqrmNN1BZHpFm
PrgQKwnnnSTUfiJUJriBHB84LXFML2Db/ABg2UvtpV3abj8kGfvLAVWlBmV0Lqsk
bE0eWggysvkKXPXsUKXhsAP5d7XkUpt/t91e9krUA5bb4ziGXtK84zCH08Hxu74m
YulR9NkMfnKEKvbgBmlfjvy5PkvtbG8AMtda8/f4vfwbpfS9b2Sa+26hXFxagcED
pSlEfvRsXmOntafIDT8Bt8itU/Z/CJYxobBCxiTHP004Li8FK4LlKQs8h8q8BGcT
zkVQ+NHr/er5qIbx2DqhJYAeGO2uukXnvFqgfdj7Gr6sRhRPY8glCih+gEw6Twh5
wo0WQ4rK7PwXTNU3TrEDKT8xtUCI8G4+IoOAYyrLqNrZG9QjUpW5UTJFe7j5LsqP
A4ytgPW2A0pl5sJf/K1X7qmgwYkkqzMl/qYFzHbjcZGlRWmFb5HHQdRCHo90M095
BGs1QxTZYMCZR3U3vjq9klaikSuAT3GjtRoYpKXcH91JqVp6cLB9TZJnFfzYurPZ
8u5lhG7B2rQCrxySmiBTXJqCAsC4nj0EeXkD9dOdveqk9VTTDMBfQaCmz5yDkuN4
iqNosMDoK3IlP0YUOc2y
=AqP6
-----END PGP SIGNATURE-----