diff options
| author | Arto Kitula <arto.kitula@gmail.com> | 2017-09-21 09:33:00 +0300 |
|---|---|---|
| committer | Arto Kitula <arto.kitula@gmail.com> | 2017-09-21 09:33:00 +0300 |
| commit | e0f68e5d229f009a6b6a9821a3764f98334e08a4 (patch) | |
| tree | 8703a4848fa729b5b61ad7f5a74812c0ef2047f3 /build_files | |
| parent | 0c019a3ffcf976fec49d9a66c1369b8ee2ade258 (diff) | |
deps build: use pip to install requests 2.18.4 and it's deps
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/requests.cmake | 26 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 8 |
2 files changed, 13 insertions, 21 deletions
diff --git a/build_files/build_environment/cmake/requests.cmake b/build_files/build_environment/cmake/requests.cmake index f5aa26b0615..412c9b2ccb9 100644 --- a/build_files/build_environment/cmake/requests.cmake +++ b/build_files/build_environment/cmake/requests.cmake @@ -16,22 +16,12 @@ # # ***** END GPL LICENSE BLOCK ***** -if(BUILD_MODE STREQUAL Release) - if(WIN32) - set(REQUESTS_INSTALL_DIR ${LIBDIR}/requests) - else() - set(REQUESTS_INSTALL_DIR ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION}/site-packages/requests) - endif() +ExternalProject_Add(external_requests + DOWNLOAD_COMMAND "" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + PREFIX ${BUILD_DIR}/requests + INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: +) - ExternalProject_Add(external_requests - URL ${REQUESTS_URI} - DOWNLOAD_DIR ${DOWNLOAD_DIR} - URL_HASH MD5=${REQUESTS_HASH} - PREFIX ${BUILD_DIR}/requests - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/requests/src/external_requests/requests ${REQUESTS_INSTALL_DIR} - ) - - add_dependencies(external_requests Make_Python_Environment) -endif(BUILD_MODE STREQUAL Release) +add_dependencies(external_requests Make_Python_Environment) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index a4d834dd22b..df15dd65417 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -145,9 +145,11 @@ set(OPENVDB_VERSION 3.1.0) set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz) set(OPENVDB_HASH 30a7e9571a03ab7bcf1a39fb62aa436f) -set(REQUESTS_VERSION v2.10.0) -set(REQUESTS_URI https://github.com/kennethreitz/requests/archive/${REQUESTS_VERSION}.zip) -set(REQUESTS_HASH 6ebefdf0210c7f0933f61501334e46c3) +set(IDNA_VERSION 2.6) +set(CHARDET_VERSION 3.0.2) +set(URLLIB3_VERSION 1.22) +set(CERTIFI_VERSION 2017.7.27.1) +set(REQUESTS_VERSION 2.18.4) set(NUMPY_VERSION v1.13.1) set(NUMPY_SHORT_VERSION 1.13) |