Skip to content

Commit 2be592b

Browse files
committed
FindUSD: invert regex to support alpha 25.05 versions
1 parent 9f1083c commit 2be592b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmake/modules/FindUSD.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ if(USD_INCLUDE_DIR AND EXISTS "${USD_INCLUDE_DIR}/pxr/pxr.h")
7878
# Detect whether PXR_USE_INTERNAL_BOOST_PYTHON is explicitly enabled
7979
set(USD_USE_INTERNAL_BOOST_PYTHON ON CACHE INTERNAL "")
8080
string(REGEX MATCH
81-
"#if +1[^\n]*\n[ \t]*#define +PXR_USE_INTERNAL_BOOST_PYTHON"
81+
"#if +0[^\n]*\n[ \t]*#define +PXR_USE_INTERNAL_BOOST_PYTHON"
8282
_use_internal_boost_python "${_pxr_header}")
8383

8484
# Use external Boost dependencies if USD version is less than 0.25.5, and
8585
# if internal Boost.Python is not explicitly enabled
86-
if (USD_VERSION VERSION_LESS "0.25.5" AND NOT _use_internal_boost_python)
86+
if (USD_VERSION VERSION_LESS "0.25.5" OR _use_internal_boost_python)
8787
set(USD_USE_INTERNAL_BOOST_PYTHON OFF CACHE INTERNAL "")
8888
list(APPEND USD_DEPENDENCIES "Boost::boost")
8989
if (BUILD_PYTHON_BINDINGS)

0 commit comments

Comments
 (0)