dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fix cmake version detection from git tag.

This commit is contained in:
James Goppert 2017-01-13 03:00:56 -05:00 committed by Lorenz Meier
parent 249d7f00ce
commit b1173f1f62
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -244,7 +244,7 @@ endif()
# version info from git
execute_process(
COMMAND Tools/tag_to_version.py ${PX4_SOURCE_DIR}
COMMAND Tools/tag_to_version.py --root ${PX4_SOURCE_DIR}
OUTPUT_VARIABLE version
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
)
@ -255,7 +255,7 @@ execute_process(
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
)
set(package-contact "px4users@googlegroups.com")
message(STATUS "PX4 VERSION: ${version}")
message(STATUS "VERSION: ${version}")
#=============================================================================
# find programs and packages

17
Tools/tag_to_version.py Normal file
View File

@ -0,0 +1,17 @@
import subprocess
import os
import argparse
p = argparse.ArgumentParser('finds major minor patch version from git tag')
p.add_argument('--root', help="root of git repo", default=".")
args = p.parse_args()
os.chdir(args.root)
p= subprocess.Popen(
'git describe --always --tags'.split(),
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate()
res = stdout.split('-')[0].split('.')
major = res[0].replace('v','')
minor = res[1]
patch = res[2]
print("{:s}.{:s}.{:s}".format(major, minor, patch))