diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-03-06 11:02:07 -0800 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-03-06 11:02:07 -0800 |
| commit | bfdbda24bf96b85104742f5578b5a921bc91a1d8 (patch) | |
| tree | 4cb02ca52db377c1f689032ba12a82238eadfe29 /indra | |
| parent | 9e00fe430d271a8eeee20c27d3d70b13d86349c7 (diff) | |
| parent | f0b256b1cb6c96aed81ee456e505247fd2169c5f (diff) | |
Automated merge with tip of lindenlab/viewer64
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/BuildVersion.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index 321aecf073..157fdd07e4 100644 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake @@ -14,6 +14,10 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n set(VIEWER_VERSION_REVISION $ENV{revision}) message(STATUS "Revision (from environment): ${VIEWER_VERSION_REVISION}") + elseif (DEFINED ENV{AUTOBUILD_BUILD_ID}) + set(VIEWER_VERSION_REVISION $ENV{AUTOBUILD_BUILD_ID}) + message(STATUS "Revision (from autobuild environment): ${VIEWER_VERSION_REVISION}") + else (DEFINED ENV{revision}) find_program(MERCURIAL NAMES hg |