diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-12-14 14:29:34 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-12-14 14:29:34 +0300 |
| commit | 551856ed320dcab6bc2f9b985783ad32506d79ab (patch) | |
| tree | 58060c9e2c07eea52aa8d1921db0c9c14fdcc8a4 /extern/mantaflow | |
| parent | fdc9350a9f6c9cb43d8c83d111e88e863f884f79 (diff) | |
Revert "Fix several issues with handling of numpy in CMake."
This reverts commit 5d570c875eda8fb9aa3635f7f4edac0dc1eaedc8.
Buildbots are still borken, need more time to investigate.
Diffstat (limited to 'extern/mantaflow')
| -rw-r--r-- | extern/mantaflow/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extern/mantaflow/CMakeLists.txt b/extern/mantaflow/CMakeLists.txt index ccf272650e3..ee155ee8636 100644 --- a/extern/mantaflow/CMakeLists.txt +++ b/extern/mantaflow/CMakeLists.txt @@ -85,7 +85,7 @@ if(WIN32) add_definitions(-D_USE_MATH_DEFINES) endif() -if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY) +if(WITH_MANTA_NUMPY AND WITH_PYTHON_INSTALL_NUMPY) add_definitions(-DNUMPY=1) endif() @@ -109,7 +109,7 @@ set(INC_SYS ${ZLIB_INCLUDE_DIRS} ) -if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY) +if(WITH_MANTA_NUMPY AND WITH_PYTHON_INSTALL_NUMPY) list(APPEND INC_SYS ${PYTHON_NUMPY_INCLUDE_DIRS} ) @@ -255,7 +255,8 @@ if(WITH_MANTA_DEPENDENCIES) ${MANTA_DEP}/cnpy/cnpy.h ) endif() -if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY) + +if(WITH_MANTA_NUMPY AND WITH_PYTHON_INSTALL_NUMPY) list(APPEND SRC ${MANTA_PP}/plugin/numpyconvert.cpp ${MANTA_PP}/plugin/tfplugins.cpp |