diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-06-20 16:40:43 -0700 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-06-20 16:40:43 -0700 |
commit | 988eae369882f57eeb4bca893dcc2c46eb773ec7 (patch) | |
tree | 8518e405fceeff8a0593329c1a0d335a30b79031 /indra/cmake/BuildVersion.cmake | |
parent | 50bb863be1c0e3528fd850aac812fc6196a7c4fc (diff) | |
parent | 7da4c651911743707c0cc7cd4bebdcefb52eb379 (diff) |
merge
Diffstat (limited to 'indra/cmake/BuildVersion.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 ) |