diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-06-16 16:41:52 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-06-16 16:41:52 -0400 |
| commit | 903729d5c97c9f93daf463e155055653b92f8fe4 (patch) | |
| tree | 178e5b9e774702c046f3e7d279ef5b9ef8fc4d1b /indra/cmake | |
| parent | f3a037f8ad520b7b070fdd057ce2d0b012121efd (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Merge. Refresh from viewer-release after 3.7.9 release.
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/BuildVersion.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index e4b63dc7cb..e618a988b8 100755 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake @@ -42,6 +42,11 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n message(SEND_ERROR "Cannot get viewer version from '${VIEWER_VERSION_BASE_FILE}'") endif ( EXISTS ${VIEWER_VERSION_BASE_FILE} ) + if ("${VIEWER_VERSION_REVISION}" STREQUAL "") + message("Ultimate fallback, revision was blank or not set: will use 0") + set(VIEWER_VERSION_REVISION 0) + endif ("${VIEWER_VERSION_REVISION}" STREQUAL "") + set(VIEWER_CHANNEL_VERSION_DEFINES "LL_VIEWER_CHANNEL=\"${VIEWER_CHANNEL}\"" "LL_VIEWER_VERSION_MAJOR=${VIEWER_VERSION_MAJOR}" |