From 9d861f021cb1f4f968dcac5a691bed41f0ba1eb2 Mon Sep 17 00:00:00 2001 From: James Goppert Date: Mon, 29 Aug 2016 22:17:19 -0400 Subject: [PATCH] Use git tag in cpack package. --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e9c5370cf..acc9c7da80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,6 +411,12 @@ px4_create_git_hash_header(HEADER ${PX4_BINARY_DIR}/build_git_version.h) # # Important to having packaging at end of cmake file. # +execute_process( + COMMAND git describe --always --tags + OUTPUT_VARIABLE git_tag + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${PX4_SOURCE_DIR} + ) set(CPACK_PACKAGE_NAME ${PROJECT_NAME}-${CONFIG}) set(CPACK_PACKAGE_VERSION ${version}) set(CPACK_PACKAGE_CONTACT ${package-contact}) @@ -420,7 +426,7 @@ set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") set(short-description "The px4 autopilot.") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${short-description}) set(CPACK_GENERATOR "ZIP") -set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CONFIG}-${version}") +set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CONFIG}-${git_tag}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${version}") set(CPACK_SOURCE_GENERATOR "ZIP;TBZ2") set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")