Skip to content
Snippets Groups Projects
Commit bfdbda24 authored by callum@lindenlab.com's avatar callum@lindenlab.com
Browse files

Automated merge with tip of lindenlab/viewer64

parents 9e00fe43 f0b256b1
No related branches found
No related tags found
Loading
...@@ -14,6 +14,10 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n ...@@ -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}) set(VIEWER_VERSION_REVISION $ENV{revision})
message(STATUS "Revision (from environment): ${VIEWER_VERSION_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}) else (DEFINED ENV{revision})
find_program(MERCURIAL find_program(MERCURIAL
NAMES hg NAMES hg
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment