Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-12-10 13:07:57 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-12-10 13:07:57 +0400
commitfe2907d6cb1c0d0cf85ee90e21b982535217c790 (patch)
tree3007978f130aecd01a5228e3b3aa3018d560f744
parent1b19b790dd599c4f3950dee3b4dccb4534ef9493 (diff)
CMake: fix numpy install not getting properly disabled when numpy was not found.
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 321cf0347fb..3e1c8fec02a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1964,7 +1964,7 @@ if(WITH_PYTHON)
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")