diff options
Diffstat (limited to 'build_files/build_environment/cmake')
| -rw-r--r-- | build_files/build_environment/cmake/numpy.cmake | 3 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/build_files/build_environment/cmake/numpy.cmake b/build_files/build_environment/cmake/numpy.cmake index b1bf1691a28..874158fb5e9 100644 --- a/build_files/build_environment/cmake/numpy.cmake +++ b/build_files/build_environment/cmake/numpy.cmake @@ -45,10 +45,9 @@ ExternalProject_Add(external_numpy DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${NUMPY_HASH} PREFIX ${BUILD_DIR}/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} install + BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable INSTALL_COMMAND ${NUMPY_INSTALL} ) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 5b5af6cfec1..77ae955d6a3 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -131,10 +131,10 @@ set(OSL_VERSION 1.7.5) set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.zip) set(OSL_HASH 6924dd5d453159e7b6eb106a08c358cf) -set(PYTHON_VERSION 3.5.3) -set(PYTHON_SHORT_VERSION 3.5) +set(PYTHON_VERSION 3.6.2) +set(PYTHON_SHORT_VERSION 3.6) set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz) -set(PYTHON_HASH 57d1f8bfbabf4f2500273fb0706e6f21) +set(PYTHON_HASH 2c68846471994897278364fc18730dd9) set(TBB_VERSION 44_20160128) set(TBB_URI https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${TBB_VERSION}oss_src_0.tgz) @@ -148,10 +148,10 @@ set(REQUESTS_VERSION v2.10.0) set(REQUESTS_URI https://github.com/kennethreitz/requests/archive/${REQUESTS_VERSION}.zip) set(REQUESTS_HASH 6ebefdf0210c7f0933f61501334e46c3) -set(NUMPY_VERSION v1.10.1) -set(NUMPY_SHORT_VERSION 1.10) -set(NUMPY_URI https://pypi.python.org/packages/a5/2e/5412784108f5dc0f827fb460ccdeaa9d76286979fe5ddd070d526d168a59/numpy-1.10.1.zip) -set(NUMPY_HASH 6f57c58bc5b28440fbeccd505da63d58) +set(NUMPY_VERSION v1.13.1) +set(NUMPY_SHORT_VERSION 1.13) +set(NUMPY_URI https://pypi.python.org/packages/c0/3a/40967d9f5675fbb097ffec170f59c2ba19fc96373e73ad47c2cae9a30aed/numpy-1.13.1.zip) +set(NUMPY_HASH 2c3c0f4edf720c3a7b525dacc825b9ae) set(LAME_VERSION 3.99.5) set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_VERSION}.tar.gz) |