diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2017-08-15 00:21:36 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2017-08-15 00:21:36 +0300 |
| commit | a8eaaa21e02b9d6842b1e959ec8df418084a0d7f (patch) | |
| tree | 32b6b37bffee8bb0d7a8dd0287974968fb65203e /build_files/build_environment/cmake/numpy.cmake | |
| parent | e79db3b2f8284bd29d0ad8fa445095bec6d33d92 (diff) | |
[build_deps/Windows] Add numpy headers to the python include folder on windows, required for D2716
Diffstat (limited to 'build_files/build_environment/cmake/numpy.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/numpy.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
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} ) |