fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-06 14:01:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile fail for GIT version

Browse Source
This commit is contained in:
Lorenz Meier
2015-10-30 16:01:21 +01:00
parent b622080a65
commit f042c077b2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2
View File
@@ -128,6 +128,8 @@ after_success:
&& echo https://px4-travis.s3.amazonaws.com/archives/Firmware/$TRAVIS_BRANCH/$TRAVIS_BUILD_ID/Firmware.zip && echo https://px4-travis.s3.amazonaws.com/archives/Firmware/$TRAVIS_BRANCH/$TRAVIS_BUILD_ID/Firmware.zip
; ;
fi fi
- git log -n 1 --pretty=format:"%H"
- git rev-parse HEAD
deploy: deploy:
provider: releases provider: releases
cmake/common/px4_base.cmake
+1 -1
View File
@@ -700,7 +700,7 @@ function(px4_create_git_hash_header)
REQUIRED HEADER REQUIRED HEADER
ARGN ${ARGN}) ARGN ${ARGN})
execute_process( execute_process(
COMMAND git rev-parse HEAD COMMAND git log -n 1 --pretty=format:"%H"
OUTPUT_VARIABLE git_desc OUTPUT_VARIABLE git_desc
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}