summaryrefslogtreecommitdiff
path: root/indra/cmake/BuildVersion.cmake
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-02-22 17:03:00 -0500
committerOz Linden <oz@lindenlab.com>2017-02-22 17:03:00 -0500
commitf77af9df438e0f955a4cf5c550f5eb3d3c919519 (patch)
tree69c3675d26878e20b4c9893cf0ca0c89cb86fcd1 /indra/cmake/BuildVersion.cmake
parentd18060e41c840f2e617c4e9a48b5070277fc24c5 (diff)
use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild 1.1.4)
Diffstat (limited to 'indra/cmake/BuildVersion.cmake')
-rw-r--r--indra/cmake/BuildVersion.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
index 321aecf073..9ee055b59a 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}")
+ elif (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