diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-30 15:29:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-30 15:29:27 -0700 |
| commit | c780f730fed7ed90bf7228fd42e9ea46b8bce1cc (patch) | |
| tree | 9a617520758cc01fcf0792a8bde24f3fee3e8612 /indra/cmake/BuildVersion.cmake | |
| parent | 68b62747edb7073dd3f4975e2b38388ae80d801c (diff) | |
| parent | 4885c122eaf1b4e304ce598f308d806322efacfc (diff) | |
DD-92 : pull merge lindenlab/sunshine-external to get AISv3 work
Diffstat (limited to 'indra/cmake/BuildVersion.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}" |