Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if(ABI_SET_VERSION)
endif()

if (NOT DEFINED BOOST_PYTHON_COMPONENT_NAME)
# may need to be, e.g. python36, python39
# may need to be, e.g. python36, python311
set(BOOST_PYTHON_COMPONENT_NAME python)
endif()

Expand Down Expand Up @@ -175,4 +175,3 @@ install(
DESTINATION
${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
)

12 changes: 12 additions & 0 deletions lib/geometry/usd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ target_include_directories(${component}
$<INSTALL_INTERFACE:include>
)

# Dirty compatibility workaround:
# Houdini 20.5 ships USD 24.03 headers that fail to compile under
# Xcode 26 / AppleClang 21 because pxr/usd/sdf/childrenProxy.h contains an
# invalid _ValueProxy::operator= path that calls SdfChildrenProxy::_Set(),
# which does not exist. This target directly compiles Houdini USD geometry
# headers, so keep the workaround target-local and remove it when the
# Houdini/USD/toolchain combination compiles normally.
target_include_directories(${component}
BEFORE PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../../hydra/hdMoonray/plugin/adapters/compat/houdini20_5_usd24_xcode26>
)

target_compile_definitions(${component}
PUBLIC
# Need std::unary_functions
Expand Down