From f042c077b2f61feaf6046eb78148116232cf3365 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 30 Oct 2015 16:01:21 +0100 Subject: [PATCH] Fix compile fail for GIT version --- .travis.yml | 2 ++ cmake/common/px4_base.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 35c9aa1c28..0b2dcd51d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,6 +128,8 @@ after_success: && echo https://px4-travis.s3.amazonaws.com/archives/Firmware/$TRAVIS_BRANCH/$TRAVIS_BUILD_ID/Firmware.zip ; fi + - git log -n 1 --pretty=format:"%H" + - git rev-parse HEAD deploy: provider: releases diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake index eb3b9c68fc..26598fef70 100644 --- a/cmake/common/px4_base.cmake +++ b/cmake/common/px4_base.cmake @@ -700,7 +700,7 @@ function(px4_create_git_hash_header) REQUIRED HEADER ARGN ${ARGN}) execute_process( - COMMAND git rev-parse HEAD + COMMAND git log -n 1 --pretty=format:"%H" OUTPUT_VARIABLE git_desc OUTPUT_STRIP_TRAILING_WHITESPACE WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}