Add cmake test fixes to go with .mod file changes made recently #2931
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
seando-adsk
commented
Mar 9, 2023
| @@ -43,6 +43,7 @@ endfunction() | |||
| # that mayaUsd_add_test manages (and will append) are: | |||
| # PATH | |||
| # PYTHONPATH | |||
| # PXR_USD_WINDOWS_DLL_PATH | |||
There was a problem hiding this comment.
In PR #2867 a client added this env var to the .mod files. I've updated our testing environment to match.
| list(APPEND MAYAUSD_VARNAME_XBMLANGPATH | ||
| "${CMAKE_INSTALL_PREFIX}/lib/icons") | ||
| # MayaUsd core library | ||
| if (BUILD_MAYAUSD_LIBRARY) |
There was a problem hiding this comment.
Moved the various env vars inside of if blocks based on their respective build option.
Comment on lines
+232
to
+235
| if(IS_WINDOWS) | ||
| list(APPEND MAYAUSD_VARNAME_PXR_USD_WINDOWS_DLL_PATH | ||
| "${CMAKE_INSTALL_PREFIX}/lib") | ||
| endif() |
Comment on lines
+252
to
+253
| list(APPEND MAYAUSD_VARNAME_PXR_MTLX_STDLIB_SEARCH_PATHS | ||
| "${CMAKE_INSTALL_PREFIX}/libraries") |
There was a problem hiding this comment.
Moved up from below.
Comment on lines
+272
to
+275
| if(IS_WINDOWS) | ||
| list(APPEND MAYAUSD_VARNAME_PXR_USD_WINDOWS_DLL_PATH | ||
| "${CMAKE_INSTALL_PREFIX}/plugin/pxr/maya/lib") | ||
| endif() |
Comment on lines
+306
to
+308
| if(IS_WINDOWS) | ||
| list(APPEND MAYAUSD_VARNAME_PXR_USD_WINDOWS_DLL_PATH $ENV{PXR_USD_WINDOWS_DLL_PATH}) | ||
| endif() |
Comment on lines
+338
to
+343
| list(APPEND MAYAUSD_VARNAME_PXR_USD_WINDOWS_DLL_PATH | ||
| "${USD_INSTALL_LOCATION}/bin") | ||
| list(APPEND MAYAUSD_VARNAME_PXR_USD_WINDOWS_DLL_PATH | ||
| "${USD_INSTALL_LOCATION}/lib") | ||
| list(APPEND MAYAUSD_VARNAME_PXR_USD_WINDOWS_DLL_PATH | ||
| "${USD_INSTALL_LOCATION}/plugin/usd") |
Comment on lines
+345
to
+346
| list(APPEND MAYAUSD_VARNAME_PXR_MTLX_STDLIB_SEARCH_PATHS | ||
| "${PXR_USD_LOCATION}/libraries") |
There was a problem hiding this comment.
Moved here (into USD section) from above
ppt-adsk
approved these changes
Mar 9, 2023
|
Sorry I accidentally added PierreT as reviewer when I wanted to add PierreB. |
pierrebai-adsk
approved these changes
Mar 9, 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.
Add cmake test fixes to go with .mod file changes made here:
#2867