Commit: a8eaaa21e02b9d6842b1e959ec8df418084a0d7f
Author: Ray Molenkamp
Date: Mon Aug 14 15:21:36 2017 -0600
Branches: master
https://developer.blender.org/rBa8eaaa21e02b9d6842b1e959ec8df418084a0d7f
[build_deps/Windows] Add numpy headers to the python include folder on windows,
required for D2716
===================================================================
M build_files/build_environment/cmake/numpy.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/numpy.cmake
b/build_files/build_environment/cmake/numpy.cmake
index 51cb30799a7..ab196dc5eec 100644
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -32,8 +32,9 @@ set(NUMPY_POSTFIX)
if(WIN32)
set(NUMPY_INSTALL
- ${CMAKE_COMMAND} -E chdir
"${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-3.5${NUMPY_DIR_POSTFIX}"
- ${CMAKE_COMMAND} -E tar "cfvz"
"${LIBDIR}/python35_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz"
"."
+ ${CMAKE_COMMAND} -E copy_directory
"${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy"
"${LIBDIR}/python/include/python3.5/numpy" &&
+ ${CMAKE_COMMAND} -E chdir
"${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-3.5${NUMPY_DIR_POSTFIX}"
+ ${CMAKE_COMMAND} -E tar "cfvz"
"${LIBDIR}/python35_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz"
"."
)
else()
set(NUMPY_INSTALL
@@ -49,7 +50,7 @@ ExternalProject_Add(external_numpy
PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d
${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff
CONFIGURE_COMMAND ""
LOG_BUILD 1
- BUILD_COMMAND ${PYTHON_BINARY}
${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION}
+ BUILD_COMMAND ${PYTHON_BINARY}
${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION}
install
INSTALL_COMMAND ${NUMPY_INSTALL}
)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
