Skip to content

FindUSD: invert regex to support alpha 25.05 versions #30

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

Merged
merged 1 commit into from
May 16, 2025
Merged

FindUSD: invert regex to support alpha 25.05 versions #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions cmake/modules/FindUSD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ if(USD_INCLUDE_DIR AND EXISTS "${USD_INCLUDE_DIR}/pxr/pxr.h")
# Detect whether PXR_USE_INTERNAL_BOOST_PYTHON is explicitly enabled
set(USD_USE_INTERNAL_BOOST_PYTHON ON CACHE INTERNAL "")
string(REGEX MATCH
"#if +1[^\n]*\n[ \t]*#define +PXR_USE_INTERNAL_BOOST_PYTHON"
_use_internal_boost_python "${_pxr_header}")
"#if +0[^\n]*\n[ \t]*#define +PXR_USE_INTERNAL_BOOST_PYTHON"
_use_external_boost_python "${_pxr_header}")

# Use external Boost dependencies if USD version is less than 0.25.5, and
# if internal Boost.Python is not explicitly enabled
if (USD_VERSION VERSION_LESS "0.25.5" AND NOT _use_internal_boost_python)
# if internal Boost.Python is not explicitly disabled
if (USD_VERSION VERSION_LESS "0.25.5" OR _use_external_boost_python)
set(USD_USE_INTERNAL_BOOST_PYTHON OFF CACHE INTERNAL "")
list(APPEND USD_DEPENDENCIES "Boost::boost")
if (BUILD_PYTHON_BINDINGS)
Expand All @@ -95,7 +95,7 @@ if(USD_INCLUDE_DIR AND EXISTS "${USD_INCLUDE_DIR}/pxr/pxr.h")
_pxr_MAJOR
_pxr_MINOR
_pxr_PATCH
_use_internal_boost_python
_use_external_boost_python
USD_VERSION
USD_DEPENDENCIES
)
Expand Down