diff options
| author | Lazydodo <github@lazydodo.com> | 2019-08-14 02:02:19 +0300 |
|---|---|---|
| committer | Lazydodo <github@lazydodo.com> | 2019-08-14 02:02:19 +0300 |
| commit | c538903558d8c648817f5921e6f7acd284645214 (patch) | |
| tree | a96e980cbe59f3d72576ed8fa9978c4f3c4aa072 /build_files/build_environment/cmake/numpy.cmake | |
| parent | 87d3685e9352a11dec3d093a3473ac1e5b8121d2 (diff) | |
deps: python 3.7.4 for windows.
This also updates to a new packaging method where python is runnable
from the library folder rather than having tarballs in the release
folder.
Diffstat (limited to 'build_files/build_environment/cmake/numpy.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/numpy.cmake | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/build_files/build_environment/cmake/numpy.cmake b/build_files/build_environment/cmake/numpy.cmake index 1a6ffa95ad6..abf2464e88c 100644 --- a/build_files/build_environment/cmake/numpy.cmake +++ b/build_files/build_environment/cmake/numpy.cmake @@ -17,6 +17,7 @@ # ***** END GPL LICENSE BLOCK ***** if(MSVC) + message("BIN >${PYTHON_BINARY}<") if(BUILD_MODE STREQUAL Debug) set(NUMPY_DIR_POSTFIX -pydebug) set(NUMPY_ARCHIVE_POSTFIX d) @@ -30,17 +31,6 @@ endif() set(NUMPY_POSTFIX) -if(WIN32) - set(NUMPY_INSTALL - ${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy" "${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" && - ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}" - ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "." - ) -else() - set(NUMPY_INSTALL echo .) - set(NUMPY_PATCH echo .) -endif() - ExternalProject_Add(external_numpy URL ${NUMPY_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} @@ -50,17 +40,10 @@ ExternalProject_Add(external_numpy CONFIGURE_COMMAND "" LOG_BUILD 1 BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable - INSTALL_COMMAND ${NUMPY_INSTALL} + INSTALL_COMMAND "" ) -if(WIN32) - ExternalProject_Add_Step(external_numpy after_install - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz - DEPENDEES install - ) -endif() - add_dependencies( external_numpy - Make_Python_Environment + external_python ) |