Skip to content

Commit

Permalink
bump Boost to version 1.85.0 for Python 3.11+ and on MacOS
Browse files Browse the repository at this point in the history
Boost 1.85.0 is the version specified by the VFX reference platform for CY 2025.

CMake supports Boost 1.85 as of version 3.29.3, but Visual Studio 2022 does not
yet offer a release bundling a 3.29.X version of CMake. Using the Boost option
"Boost_ADDITIONAL_VERSIONS=1.85" is needed to support building OpenUSD using
the version of CMake currently bundled with the latest release of Visual Studio
2022.
  • Loading branch information
mattyjams committed Oct 7, 2024
1 parent cd2f61b commit 99e009d
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions build_scripts/build_usd.py
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,8 @@ def InstallZlib(context, force, buildArgs):
"include/boost/version.hpp",
"include/boost-1_76/boost/version.hpp",
"include/boost-1_78/boost/version.hpp",
"include/boost-1_82/boost/version.hpp"
"include/boost-1_82/boost/version.hpp",
"include/boost-1_85/boost/version.hpp"
]

def InstallBoost_Helper(context, force, buildArgs):
Expand Down Expand Up @@ -782,7 +783,7 @@ def InstallBoost_Helper(context, force, buildArgs):
pyInfo = GetPythonInfo(context)
pyVer = (int(pyInfo[3].split('.')[0]), int(pyInfo[3].split('.')[1]))
if MacOS() or (context.buildBoostPython and pyVer >= (3,11)):
BOOST_URL = "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.zip"
BOOST_URL = "https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.zip"
elif context.buildBoostPython and pyVer >= (3, 10):
BOOST_URL = "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.zip"
elif IsVisualStudio2022OrGreater():
Expand Down Expand Up @@ -1338,6 +1339,7 @@ def InstallOpenVDB(context, force, buildArgs):
# system installed boost
extraArgs.append('-DBoost_NO_BOOST_CMAKE=On')
extraArgs.append('-DBoost_NO_SYSTEM_PATHS=True')
extraArgs.append('-DBoost_ADDITIONAL_VERSIONS=1.85')

extraArgs.append('-DBLOSC_ROOT="{instDir}"'
.format(instDir=context.instDir))
Expand Down Expand Up @@ -1392,6 +1394,7 @@ def InstallOpenImageIO(context, force, buildArgs):
# system installed boost
extraArgs.append('-DBoost_NO_BOOST_CMAKE=On')
extraArgs.append('-DBoost_NO_SYSTEM_PATHS=True')
extraArgs.append('-DBoost_ADDITIONAL_VERSIONS=1.85')

# OpenImageIO 2.3.5 changed the default postfix for debug library
# names from "" to "_d". USD's build system currently does not support
Expand Down Expand Up @@ -1854,6 +1857,7 @@ def InstallUSD(context, force, buildArgs):
# system installed boost
extraArgs.append('-DBoost_NO_BOOST_CMAKE=On')
extraArgs.append('-DBoost_NO_SYSTEM_PATHS=True')
extraArgs.append('-DBoost_ADDITIONAL_VERSIONS=1.85')
extraArgs += buildArgs

RunCMake(context, force, extraArgs)
Expand Down

0 comments on commit 99e009d

Please sign in to comment.