[Bf-blender-cvs] [123fd3d5c44] experimental-build: More attempts to fix numpy for windows/apple...

[Bastien Montagne]

Commit: 123fd3d5c446eac04e2ae06f27ddb3b0b7ed7356
Author: Bastien Montagne
Date:   Mon Dec 14 16:00:42 2020 +0100
Branches: experimental-build
https://developer.blender.org/rB123fd3d5c446eac04e2ae06f27ddb3b0b7ed7356

More attempts to fix numpy for windows/apple...

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3b67085f7f..c8ae562f6ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -347,17 +347,17 @@ if(UNIX AND NOT APPLE)
 endif()
 
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
-if(WIN32 OR APPLE)
-  # Windows and macOS have this bundled with Python libraries.
-elseif(WITH_PYTHON_INSTALL OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE) OR WITH_MOD_FLUID)
+
+if((WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE) OR WITH_MOD_FLUID)
   option(WITH_PYTHON_NUMPY "Include NumPy in Blender (used by Audaspace and Mantaflow)"  ON)
+endif()
 
+if(WIN32 OR APPLE)
+  # Windows and macOS have this bundled with Python libraries.
+elseif(WITH_PYTHON_INSTALL OR WITH_PYTHON_NUMPY)
   set(PYTHON_NUMPY_PATH            "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
   mark_as_advanced(PYTHON_NUMPY_PATH)
-  
-  # We still need to set it up here as default for windows/apple builds.
-  set(PYTHON_NUMPY_INCLUDE_DIRS    "${PYTHON_NUMPY_PATH}/numpy/core/include"
-      CACHE PATH "Path to the include directory of the NumPy module")
+  set(PYTHON_NUMPY_INCLUDE_DIRS    "" CACHE PATH "Path to the include directory of the NumPy module")
   mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
 endif()
 if(WITH_PYTHON_INSTALL)