Automated merge with tip of lindenlab/viewer64

2017-03-06 11:02:07 -08:00 · 2017-03-06 11:02:07 -08:00 · bfdbda24bf
parent 9e00fe430d f0b256b1cb
commit bfdbda24bf
1 changed files with 4 additions and 0 deletions
--- 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