diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-12-14 18:40:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-12-14 18:44:55 +0300 |
| commit | 010f44b855cab664126975543e0e760576202d85 (patch) | |
| tree | 43bf4eec832dec0720555564f1f63f1681fead25 /extern/audaspace | |
| parent | f4df036bc497b134789b624efd9008c6f4b9c6c8 (diff) | |
Fix several issues with handling of numpy in CMake.
Issues were:
* Abusing of `WITH_PYTHON_INSTALL_NUMPY` by both Audaspace and
Mantaflow.
- `PYTHON_INSTALL` options only decide whether we copy python (and
some extra modules) in our Blender installation. On linux it
makes much more sense to use global python installation.
- Now we have instead a proper `WITH_PYTHON_NUMPY`
* Bad assumptions regarding path of headers relative to path of python
module.
- In current Debian testing, modules are under `python3.9`
directory, while headers are under `python3` directory.
- Now we properly `find_path` for headers as well, modifying
`find_python_package` to take an optional argument for headers.
Note that the required changes done to `extern` libraries are in
blender-specific files that do not exist upstream.
Differential Revision: https://developer.blender.org/D9773
Diffstat (limited to 'extern/audaspace')
| -rw-r--r-- | extern/audaspace/blender_config.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/audaspace/blender_config.cmake b/extern/audaspace/blender_config.cmake index 1f8f85b9868..12810e2b044 100644 --- a/extern/audaspace/blender_config.cmake +++ b/extern/audaspace/blender_config.cmake @@ -24,6 +24,6 @@ set(JACK_FOUND ${WITH_JACK}) set(LIBSNDFILE_FOUND ${WITH_CODEC_SNDFILE}) set(OPENAL_FOUND ${WITH_OPENAL}) set(PYTHONLIBS_FOUND TRUE) -set(NUMPY_FOUND TRUE) +set(NUMPY_FOUND ${WITH_PYTHON_NUMPY}) set(NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_INCLUDE_DIRS}) set(SDL_FOUND ${WITH_SDL}) |