diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-30 13:38:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-30 13:38:32 +0400 |
| commit | d113fd8ab70a7df22a4ec4c26fce7a68aa98fb1a (patch) | |
| tree | 3615dd33ad06108df8ed31d1fe7397f3a28cceec /CMakeLists.txt | |
| parent | e08a46c070cacf61312973392615cc00a1269209 (diff) | |
WITH_PYTHON_INSTALL_NUMPY option for unix/cmake, just copies from site-packages.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 16de9a4055e..e8bdc5375fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,6 +228,7 @@ if(UNIX AND NOT APPLE) option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) endif() option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON) +option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON) option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF) mark_as_advanced(WITH_MINGW64) @@ -1612,6 +1613,13 @@ if(WITH_PYTHON) "to a valid python include path. Containing " "Python.h for python version \"${PYTHON_VERSION}\"") endif() + + if(WITH_PYTHON_INSTALL_NUMPY) + if(NOT EXISTS "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy") + message(WARNING "Numpy path '${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy' is missing, " + "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python") + endif() + endif() endif() @@ -1668,7 +1676,7 @@ if(FIRST_RUN) _setting) set(_msg " * ${_setting}") string(LENGTH "${_msg}" _len) - while("28" GREATER "${_len}") + while("32" GREATER "${_len}") set(_msg "${_msg} ") math(EXPR _len "${_len} + 1") endwhile() @@ -1728,6 +1736,7 @@ if(FIRST_RUN) info_cfg_text("Python:") info_cfg_option(WITH_PYTHON_INSTALL) + info_cfg_option(WITH_PYTHON_INSTALL_NUMPY) info_cfg_option(WITH_PYTHON_MODULE) info_cfg_option(WITH_PYTHON_SAFETY) |