diff options
author | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:15:15 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:15:15 -0400 |
commit | 82bf4e4db2bdb9effdf64e9edaa76a78913e25d3 (patch) | |
tree | 7f44a97fdf51222e743e18464d1b2d0ccb5b830e /indra/cmake | |
parent | 731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (diff) | |
parent | 86b4019684af96a64a1d439851f177d7c18e4c24 (diff) |
merge changes for DRTVWR-285
Diffstat (limited to 'indra/cmake')
-rwxr-xr-x | indra/cmake/BuildVersion.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index b9ec8f5266..af2063ce6d 100755 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake @@ -18,7 +18,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n find_program(MERCURIAL hg) if (DEFINED MERCURIAL) execute_process( - COMMAND ${MERCURIAL} log -r tip --template "{p1rev}" + COMMAND ${MERCURIAL} log -r tip --template "{rev}" OUTPUT_VARIABLE VIEWER_VERSION_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE ) |