Blender Git Loki

Git Commits -> Revision 414aaad

Revision 414aaad by Bastien Montagne (experimental-build)
December 14, 2020, 11:33 (GMT)
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

Commit Details:

Full Hash: 414aaad1d4652404205ae91b29efe3a607e84f0b
Parent Commit: c2e155f
Lines Changed: +52, -14

4 Modified Paths:

/build_files/cmake/macros.cmake (+40, -0) (Diff)
/CMakeLists.txt (+8, -9) (Diff)
/extern/audaspace/blender_config.cmake (+1, -1) (Diff)
/extern/mantaflow/CMakeLists.txt (+3, -4) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021