livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix version string: We don't build a merge before committing and don't have two parents!

meow-7.2.2
Ansariel 2013-07-10 14:08:42 +02:00
parent 706b885155
commit 97db0a0cf2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/cmake/BuildVersion.cmake
View File

@ -18,7 +18,8 @@ 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 "{p1rev}" <FS:Ansa> We don't build a merge before committing and don't have two parents!
COMMAND ${MERCURIAL} log -r tip --template "{rev}"
OUTPUT_VARIABLE VIEWER_VERSION_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
)