Detect if USD was built with extra security patches #2945
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
and set mod file variable MAYA_USD_VERSION accordingly.
seando-adsk
commented
Mar 15, 2023
Comment on lines
+69
to
+82
| # Set special Autodesk USD version. We use this to communicate whether or not | ||
| # there are extra patches on-top of the normal USD build. | ||
| set(ADSK_USD_VERSION ${USD_VERSION}) | ||
| if (USD_VERSION VERSION_LESS_EQUAL "0.23.02") | ||
| # In the security fix there was a new inline method "max_size" added so we | ||
| # can use that to determine if this USD build has the security fix. | ||
| if (USD_INCLUDE_DIR AND EXISTS "${USD_INCLUDE_DIR}/pxr/base/vt/array.h") | ||
| file(STRINGS ${USD_INCLUDE_DIR}/pxr/base/vt/array.h USD_HAS_SECURITY_PATCH REGEX "constexpr size_t max_size\(\)") | ||
| if (USD_HAS_SECURITY_PATCH) | ||
| set(ADSK_USD_VERSION "${ADSK_USD_VERSION}-ad1") | ||
| message(STATUS "USD v${USD_VERSION} has security patches.") | ||
| endif() | ||
| endif() | ||
| endif() |
There was a problem hiding this comment.
Added new cmake variable "ADSK_USD_VERSION" which starts out equal to normal "USD_VERSION". Detect in an automatic way if the USD build (any version <= 0.23.02) has the extra security patches. Do this by looking at the vt/array.h header file for a new method which was added in one of the patches. If so then add "-ad1" to new variable ADSK_USD_VERSION.
| @@ -233,7 +233,7 @@ void registerVersionedPlugins() | |||
| static std::once_flag once; | |||
| std::call_once(once, []() { | |||
| const std::string pythonVersion = TOSTRING(MAYA_PY_VERSION); | |||
| const std::string usdVersion = TOSTRING(MAYA_USD_VERSION); | |||
| const std::string usdVersion = TOSTRING(ADSK_USD_VERSION); | |||
There was a problem hiding this comment.
Use the new adsk usd version here which may contain "-ad1".
| @@ -6,7 +6,7 @@ scripts: | |||
| resources: | |||
| PYTHONPATH+:=lib/python | |||
| USD_LOCATION:= | |||
| MAYA_USD_VERSION=${USD_VERSION} | |||
| MAYA_USD_VERSION=${ADSK_USD_VERSION} | |||
There was a problem hiding this comment.
In the mod file set MAYA_USD_VERSION to new ADSK_USD_VERSION.
neilh-adsk
previously approved these changes
Mar 15, 2023
seando-adsk
added
the
ready-for-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Detect if USD was built with extra security patches and set mod file variable MAYA_USD_VERSION accordingly.