[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52839] trunk/blender/CMakeLists.txt: CMake: fix numpy install not getting properly disabled when numpy was not found.
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Dec 10 10:08:05 CET 2012
Revision: 52839
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52839
Author: blendix
Date: 2012-12-10 09:07:57 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
CMake: fix numpy install not getting properly disabled when numpy was not found.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-12-10 08:15:14 UTC (rev 52838)
+++ trunk/blender/CMakeLists.txt 2012-12-10 09:07:57 UTC (rev 52839)
@@ -1964,7 +1964,7 @@
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 ${PYTHON_NUMPY_PATH} STREQUAL "") AND (NOT ${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
# 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")
More information about the Bf-blender-cvs
mailing list