Skip to content

Commit

Permalink
qmake quiet output
Browse files Browse the repository at this point in the history
-GIT_TAG is redundant
-closes mavlink#4023
  • Loading branch information
dagar committed Sep 14, 2016
1 parent c28d22e commit cbd6c75
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions QGCCommon.pri
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ exists ($$PWD/.git) {
GIT_TIME = $$system(git --git-dir $$PWD/.git --work-tree $$PWD show --oneline --format=\"%ci\" -s HEAD)

# determine if we're on a tag matching vX.Y.Z (stable release)
GIT_TAG = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --exact-match --tags HEAD)
contains(GIT_TAG, v[0-9].[0-9].[0-9]) {
contains(GIT_DESCRIBE, v[0-9].[0-9].[0-9]) {
# release version "vX.Y.Z"
GIT_VERSION = $${GIT_DESCRIBE}
} else {
Expand All @@ -130,7 +129,7 @@ exists ($$PWD/.git) {
MAC_BUILD = $$section(VERSION, ".", 3, 3)
message(QGroundControl version $${MAC_VERSION} build $${MAC_BUILD} describe $${GIT_VERSION})
} else {
message(QGroundControl version $${VERSION} describe $${GIT_VERSION})
message(QGroundControl $${GIT_VERSION})
}
} else {
GIT_VERSION = None
Expand Down

0 comments on commit cbd6c75

Please sign in to comment.