diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-05 06:15:03 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-05 06:15:03 -0700 |
| commit | db85ed33e03c81b69ec020f6daf302bc2478163e (patch) | |
| tree | a2c47fdda14579beabf33a660b7c522076b93f33 /indra/cmake | |
| parent | 50689a13baf07bcd68bfb77b111b066da972f076 (diff) | |
| parent | edf0a0c7f5dcfee2010447bc877515b70d1b1059 (diff) | |
MErge
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 0094e313c7..b9ec8f5266 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} parents --template "{rev}" + COMMAND ${MERCURIAL} log -r tip --template "{p1rev}" OUTPUT_VARIABLE VIEWER_VERSION_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE ) |