diff options
| author | Campbell Barton <campbell@blender.org> | 2022-05-20 04:17:34 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-05-20 04:18:49 +0300 |
| commit | 42a6c226d03624d880fe480eeaf2fda1bf8f5ab9 (patch) | |
| tree | 5af33b6a39babb78d57ef202def1f56163a1dbbc /intern | |
| parent | c1dcc64750f1e86dfc63ae9800e27dca5edf67f0 (diff) | |
CMake: fix AUDASPACE disabling WITH_PYTHON for Blender
When AUDASPACE couldn't find NUMPY, it would disable WITH_PYTHON for
the rest of Blender. Now setting the value globally is only done for
standalone AUDASPACE builds. Now it's possible to build Blender with
AUDASPACE & PYTHON but without NUMPY.
While this isn't an especially important configuration to support,
having Python mysteriously disabled is a hassle to troubleshoot.
NOTE: extern/audaspace/CMakeLists.txt has become out sync with the
original [0], it seems this is being maintained in our repository.
[0]: https://github.com/neXyon/audaspace/blob/master/CMakeLists.txt
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 67b45be8158..0e2b27c0760 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -35,11 +35,15 @@ if(NOT WITH_SYSTEM_AUDASPACE) else() list(APPEND LIB ${AUDASPACE_C_LIBRARIES} - ${AUDASPACE_PY_LIBRARIES} ) + if(WITH_PYTHON AND WITH_PYTHON_NUMPY) + list(APPEND LIB + ${AUDASPACE_PY_LIBRARIES} + ) + endif() endif() -if(WITH_PYTHON) +if(WITH_PYTHON AND WITH_PYTHON_NUMPY) list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS} ) |