From 22de7c019765200bb11509ff7c030022779e3dd8 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Fri, 24 Oct 2014 23:45:52 -0400
Subject: [PATCH] fixed: version number generation off by one
---
indra/cmake/BuildVersion.cmake | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
index e618a988b8..0f0ca27116 100755
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -20,9 +20,8 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
find_program(SED sed)
if (DEFINED MERCURIAL AND DEFINED WORDCOUNT AND DEFINED SED)
execute_process(
- COMMAND ${MERCURIAL} log -r tip:0 --template '\\n'
- COMMAND ${WORDCOUNT} -l
- COMMAND ${SED} "s/ //g"
+ COMMAND ${MERCURIAL} identify -n
+ COMMAND ${SED} "s/+//"
OUTPUT_VARIABLE VIEWER_VERSION_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
--
GitLab