CMake: fix numpy install not getting properly disabled when numpy was not found.

This commit is contained in:
Brecht Van Lommel
2012-12-10 09:07:57 +00:00
parent 1b19b790dd
commit fe2907d6cb

View File

@@ -1964,7 +1964,7 @@ if(WITH_PYTHON)
if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
# set but invalid # set but invalid
# -- disabled until we make numpy bundled with blender - campbell # -- 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") # if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
# message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' " # 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") # "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")