[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52773] trunk/blender/CMakeLists.txt: disable numpy warning with cmake, since we didnt end up bundling this with blender yet.

Campbell Barton ideasman42 at gmail.com
Tue Dec 4 18:54:34 CET 2012


Revision: 52773
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52773
Author:   campbellbarton
Date:     2012-12-04 17:54:32 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
disable numpy warning with cmake, since we didnt end up bundling this with blender yet.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-12-04 17:38:55 UTC (rev 52772)
+++ trunk/blender/CMakeLists.txt	2012-12-04 17:54:32 UTC (rev 52773)
@@ -1932,12 +1932,13 @@
 
 	if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
 		# set but invalid
+        # -- disabled until we make numpy bundled with blender - campbell
 		if(NOT ${PYTHON_NUMPY_PATH} STREQUAL "")
-			if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
-				message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
-				                "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
-				set(WITH_PYTHON_INSTALL_NUMPY OFF)
-			endif()
+#			if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
+#				message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
+#				                "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
+#				set(WITH_PYTHON_INSTALL_NUMPY OFF)
+#			endif()
 		# not set, so initialize
 		else()
 			string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")




More information about the Bf-blender-cvs mailing list