From 3ba20aa866e5bebc7050cd8956daa5bd44b60467 Mon Sep 17 00:00:00 2001 From: Ray molenkamp Date: Tue, 9 Feb 2021 13:43:43 +0000 Subject: CMake/Deps: Boost 1.73 Just a simple version bump. Maniphest Tasks: T85365 Differential Revision: https://developer.blender.org/D10314 --- build_files/build_environment/cmake/boost.cmake | 2 +- build_files/build_environment/cmake/versions.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'build_files/build_environment') diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index d01c62b679c..3a90add9539 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -23,7 +23,7 @@ if(WIN32) set(BOOST_COMPILER_STRING -vc141) set(BOOST_CONFIGURE_COMMAND bootstrap.bat) - set(BOOST_BUILD_COMMAND bjam) + set(BOOST_BUILD_COMMAND b2) set(BOOST_BUILD_OPTIONS runtime-link=shared ) set(BOOST_HARVEST_CMD ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ ) if(BUILD_MODE STREQUAL Release) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index f61f02b8669..6d8c13fb88d 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -32,11 +32,11 @@ set(JPEG_VERSION 2.0.4) set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz) set(JPEG_HASH 44c43e4a9fb352f47090804529317c88) -set(BOOST_VERSION 1.70.0) -set(BOOST_VERSION_NODOTS 1_70_0) -set(BOOST_VERSION_NODOTS_SHORT 1_70) +set(BOOST_VERSION 1.73.0) +set(BOOST_VERSION_NODOTS 1_73_0) +set(BOOST_VERSION_NODOTS_SHORT 1_73) set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz) -set(BOOST_HASH fea771fe8176828fabf9c09242ee8c26) +set(BOOST_HASH 4036cd27ef7548b8d29c30ea10956196) # Using old version as recommended by OpenVDB build documentation. set(BLOSC_VERSION 1.5.0) -- cgit v1.2.3