diff options
| author | simon <none@none> | 2013-08-26 14:43:23 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-26 14:43:23 -0700 |
| commit | 27d637d0f14fdfff496256222dc1343d2d7ee9ae (patch) | |
| tree | 32b0f244e480cfddaa67fa89df40ad7c824adfc9 /indra/cmake | |
| parent | 3f5e6280dbee3414d464a96a8d9d037c30adb123 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge downstream code from CHUIStorm release
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 ) |