Preparation for Ufe v4.1 #2960
Preparation for Ufe v4.1 #2960
Conversation
| @@ -48,20 +48,31 @@ if(UFE_INCLUDE_DIR AND EXISTS "${UFE_INCLUDE_DIR}/ufe/ufe.h") | |||
| endforeach() | |||
| set(UFE_VERSION ${UFE_MAJOR_VERSION}.${UFE_MINOR_VERSION}.${UFE_PATCH_LEVEL}) | |||
|
|
|||
| if("${UFE_MAJOR_VERSION}" STREQUAL "0") | |||
| if(UFE_MAJOR_VERSION VERSION_EQUAL "0") | |||
There was a problem hiding this comment.
Switched these ufe checks to use VERSION_XXX instead of STR_XXX.
| elseif(UFE_VERSION VERSION_EQUAL "4.1.0") | ||
| # Temporary. Once next Maya PR is released with UFE v4.1.0 this should | ||
| # be removed (along with all the UFE_PREVIEW_VERSION_NUM checks). | ||
| # TODO - YY needs to be replaced with the "last" patch value before the bump | ||
| # to 4.1.0. | ||
| #set(UFE_PREVIEW_VERSION_NUM 41YY) | ||
| message(FATAL_ERROR "Modification required to set UFE_PREVIEW_VERSION_NUM for Ufe v4.1") |
There was a problem hiding this comment.
Prep for the final switch to Ufe v4.1. It will require setting line 62 to the correct value. So make sure that is done by adding the fatal error here.
| elseif((UFE_VERSION VERSION_GREATER_EQUAL "4.0.100") AND (UFE_VERSION VERSION_LESS "5.0.0")) | ||
| # Temporary. Once next Maya PR is released with UFE v4.X.0 this should | ||
| # be changed into UFE_PREVIEW_VERSION_NUM of 4XYY, where YY is the last value from "4.0.YY" | ||
| math(EXPR UFE_PREVIEW_VERSION_NUM "4 * 1000 + ${UFE_MINOR_VERSION} * 100 + ${UFE_PATCH_LEVEL}") |
There was a problem hiding this comment.
ufe preview version num for Ufe v4.1 while in development.
There was a problem hiding this comment.
One thing I'm not clear on and it's possible I messed this up as well, but should this be 4.1.0 instead of 4.0.100? Given that the minor version is being multiplied by 100?
There was a problem hiding this comment.
It should be 4.0.100, because 4.1 is not released yet (minor version 0). So the version string will be 4000 + 0 x 100 + 100, since UFE_PATCH_LEVEL starts at 100, which will give 4100. For UFE 4.2 development, the current UFE minor version will be 1, so the version string will be 4000 + 1 x 100 + 100, giving 4200, as expected.
| REGEX "#define UFE_V[0-9]+(_[0-9]+)?_FEATURES_AVAILABLE$") | ||
| foreach(_ufe_tmp ${_ufe_features}) | ||
| if(_ufe_tmp MATCHES "#define UFE_V([0-9]+)_FEATURES_AVAILABLE$") | ||
| if(_ufe_tmp MATCHES "#define UFE_V([0-9]+(_[0-9]+)?)_FEATURES_AVAILABLE$") |
There was a problem hiding this comment.
Optional regex to detect the UFE_VX_X_FEATURES_AVAILABLE (such as V4_1).
| elseif((UFE_VERSION VERSION_GREATER_EQUAL "4.0.100") AND (UFE_VERSION VERSION_LESS "5.0.0")) | ||
| # Temporary. Once next Maya PR is released with UFE v4.X.0 this should | ||
| # be changed into UFE_PREVIEW_VERSION_NUM of 4XYY, where YY is the last value from "4.0.YY" | ||
| math(EXPR UFE_PREVIEW_VERSION_NUM "4 * 1000 + ${UFE_MINOR_VERSION} * 100 + ${UFE_PATCH_LEVEL}") |
There was a problem hiding this comment.
One thing I'm not clear on and it's possible I messed this up as well, but should this be 4.1.0 instead of 4.0.100? Given that the minor version is being multiplied by 100?
| elseif((UFE_VERSION VERSION_GREATER_EQUAL "4.0.100") AND (UFE_VERSION VERSION_LESS "5.0.0")) | ||
| # Temporary. Once next Maya PR is released with UFE v4.X.0 this should | ||
| # be changed into UFE_PREVIEW_VERSION_NUM of 4XYY, where YY is the last value from "4.0.YY" | ||
| math(EXPR UFE_PREVIEW_VERSION_NUM "4 * 1000 + ${UFE_MINOR_VERSION} * 100 + ${UFE_PATCH_LEVEL}") |
There was a problem hiding this comment.
It should be 4.0.100, because 4.1 is not released yet (minor version 0). So the version string will be 4000 + 0 x 100 + 100, since UFE_PATCH_LEVEL starts at 100, which will give 4100. For UFE 4.2 development, the current UFE minor version will be 1, so the version string will be 4000 + 1 x 100 + 100, giving 4200, as expected.
seando-adsk
added
build
No description provided.