Can't defeat PATH variable on Mac OS.
--HG-- branch : release
This commit is contained in:
parent
1f0ac82547
commit
c77b165cf0
|
@ -131,8 +131,13 @@ CONFIG(debug, debug|release){
|
||||||
QMAKE_LFLAGS_RELEASE =
|
QMAKE_LFLAGS_RELEASE =
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macx{
|
||||||
|
HG = /usr/local/bin/hg # Can't defeat PATH variable on Mac OS.
|
||||||
|
}else {
|
||||||
|
HG = hg # All other platforms all OK.
|
||||||
|
}
|
||||||
#latest tag distance number for using in version
|
#latest tag distance number for using in version
|
||||||
HG_DISTANCE=$$system(hg log -r. --template '{latesttagdistance}')
|
HG_DISTANCE=$$system($${HG} log -r. --template '{latesttagdistance}')
|
||||||
isEmpty(HG_DISTANCE){
|
isEmpty(HG_DISTANCE){
|
||||||
HG_DISTANCE = 0 # if we can't find local revision left 0.
|
HG_DISTANCE = 0 # if we can't find local revision left 0.
|
||||||
}
|
}
|
||||||
|
@ -141,10 +146,10 @@ CONFIG(debug, debug|release){
|
||||||
|
|
||||||
#build revision number for using in version
|
#build revision number for using in version
|
||||||
unix {
|
unix {
|
||||||
HG_HESH=$$system("hg log -r. --template '{node|short}'")
|
HG_HESH=$$system("$${HG} log -r. --template '{node|short}'")
|
||||||
} else {
|
} else {
|
||||||
# Use escape character before "|" on Windows
|
# Use escape character before "|" on Windows
|
||||||
HG_HESH=$$system(hg log -r. --template "{node^|short}")
|
HG_HESH=$$system($${HG} log -r. --template "{node^|short}")
|
||||||
}
|
}
|
||||||
isEmpty(HG_HESH){
|
isEmpty(HG_HESH){
|
||||||
HG_HESH = "unknown" # if we can't find build revision left unknown.
|
HG_HESH = "unknown" # if we can't find build revision left unknown.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user