[Plplot-cvs] SF.net SVN: plplot:[11008] trunk/cmake/modules/python.cmake

[<ai...@us...>]

Revision: 11008
          http://plplot.svn.sourceforge.net/plplot/?rev=11008&view=rev
Author:   airwin
Date:     2010-05-19 06:30:22 +0000 (Wed, 19 May 2010)

Log Message:
-----------
If USE_NUMERIC is ON, force HAVE_NUMPY OFF immediately.  The logic really
only makes sense with this change, and forcing Numeric is what is documented
for the meaning of USE_NUMERIC.

Modified Paths:
--------------
    trunk/cmake/modules/python.cmake

Modified: trunk/cmake/modules/python.cmake
===================================================================
--- trunk/cmake/modules/python.cmake	2010-05-18 19:09:05 UTC (rev 11007)
+++ trunk/cmake/modules/python.cmake	2010-05-19 06:30:22 UTC (rev 11008)
@@ -62,6 +62,9 @@
 
 option(HAVE_NUMPY "Use numpy rather than deprecated Numeric" ON)
 option(USE_NUMERIC "Force use of deprecated Numeric" OFF)
+if(USE_NUMERIC)
+  set(HAVE_NUMPY OFF CACHE BOOL "Use numpy rather than deprecated Numeric" FORCE)
+endif(USE_NUMERIC)
 
 if(ENABLE_python)
   # NUMERIC_INCLUDE_PATH = path to arrayobject.h for either Numeric or numpy.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.