Skip to content

Support MacOS Tahoe 26.5 build (cmake4, clang21) #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nshelton wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support MacOS Tahoe 26.5 build (cmake4, clang21) #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7718de4
Merge pull request #232 from dwanim/nshelton/support-cmake4-clang21
nshelton Jul 31, 2026
bc1d489
houdini 20 houdini-usd fix
nshelton Aug 15, 2026
0f74cc1
improve setup scripts
nshelton Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CMakeDWAPresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@
"OIIO_PYTHON" : "$env{DEPS_ROOT}/lib/python3.9/site-packages"
},
"cacheVariables": {
"CMAKE_PREFIX_PATH": "$env{DEPS_ROOT}"
"CMAKE_PREFIX_PATH": "$env{DEPS_ROOT}",
"BUILD_MATERIALX_SHADERS": "ON",
"CMAKE_IGNORE_PATH": "/opt/homebrew",
"CMAKE_IGNORE_PREFIX_PATH": "/opt/homebrew",
"CMAKE_POLICY_VERSION_MINIMUM": "3.5",
"Python_EXECUTABLE": "/usr/bin/python3"
}
},
{
Expand Down
7 changes: 6 additions & 1 deletion CMakeMacOSPresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@
"OIIO_PYTHON" : "$env{DEPS_ROOT}/lib/python3.9/site-packages"
},
"cacheVariables": {
"CMAKE_PREFIX_PATH": "$env{DEPS_ROOT}"
"CMAKE_PREFIX_PATH": "$env{DEPS_ROOT}",
"CMAKE_CXX_FLAGS": "-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION -I${sourceParentDir}/building/macOS/houdini-usd-fixes",
"CMAKE_IGNORE_PATH": "/opt/homebrew",
"CMAKE_IGNORE_PREFIX_PATH": "/opt/homebrew",
"CMAKE_POLICY_VERSION_MINIMUM": "3.5",
"Python_EXECUTABLE": "/usr/bin/python3"
}
},
{
Expand Down
Binary file added building/.DS_Store
View file
Open in desktop
Binary file not shown.
25 changes: 16 additions & 9 deletions building/macOS/Boost.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
Only in Boost-prefix-mod/src/Boost: b2
Only in Boost-prefix-mod/src/Boost: bin.v2
diff -ru Boost-prefix/src/Boost/boost/mpl/aux_/integral_wrapper.hpp Boost-prefix-mod/src/Boost/boost/mpl/aux_/integral_wrapper.hpp
--- Boost-prefix/src/Boost/boost/mpl/aux_/integral_wrapper.hpp 2025-10-19 16:45:55
+++ Boost-prefix-mod/src/Boost/boost/mpl/aux_/integral_wrapper.hpp 2025-10-19 16:37:32
--- Boost-prefix/src/Boost/boost/mpl/aux_/integral_wrapper.hpp 2026-07-16 20:54:37
+++ Boost-prefix-mod/src/Boost/boost/mpl/aux_/integral_wrapper.hpp 2026-07-16 20:54:03
@@ -13,6 +13,11 @@

// NO INCLUDE GUARDS, THE HEADER IS INTENDED FOR MULTIPLE INCLUSION!
Expand All @@ -15,8 +13,17 @@ diff -ru Boost-prefix/src/Boost/boost/mpl/aux_/integral_wrapper.hpp Boost-prefix
#include <boost/mpl/integral_c_tag.hpp>
#include <boost/mpl/aux_/static_cast.hpp>
#include <boost/mpl/aux_/nttp_decl.hpp>
Only in Boost-prefix-mod/src/Boost: project-config.jam
Only in Boost-prefix-mod/src/Boost/tools/build/src/engine: b2
Only in Boost-prefix-mod/src/Boost/tools/build/src/engine: bjam
Only in Boost-prefix-mod/src/Boost-stamp: Boost-configure
Only in Boost-prefix-mod/src/Boost-stamp: Boost-patch
@@ -68,6 +73,13 @@
|| (BOOST_WORKAROUND(__HP_aCC, <= 53800) && (BOOST_WORKAROUND(__hpxstd98, != 1)))
typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)) ) next;
typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)) ) prior;
+#elif defined(__clang__)
+ // clang rejects out-of-range enum conversions in constant expressions
+ // (a hard error since clang 20 that pragmas cannot suppress), so keep
+ // enum-typed wrappers at their current value: next/prior arithmetic is
+ // only meaningful for integral value types.
+ typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (__is_enum(AUX_WRAPPER_VALUE_TYPE) ? value : value + 1)) ) next;
+ typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (__is_enum(AUX_WRAPPER_VALUE_TYPE) ? value : value - 1)) ) prior;
#else
typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (value + 1)) ) next;
typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (value - 1)) ) prior;
Loading