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

Automatically set cmake version.

This commit is contained in:
James Goppert 2017-01-12 18:11:02 -05:00 committed by Lorenz Meier
parent 73462dc5e5
commit 50159cabbe
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -242,17 +242,20 @@ if (NOT ${CMAKE_VERSION} VERSION_LESS 3.1.0)
cmake_policy(SET CMP0054 NEW) # don't dereference quoted variables cmake_policy(SET CMP0054 NEW) # don't dereference quoted variables
endif() endif()
# version info from git
execute_process(
COMMAND Tools/tag_to_version.py ${PX4_SOURCE_DIR}
OUTPUT_VARIABLE version
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
)
execute_process( execute_process(
COMMAND git describe --always --tags COMMAND git describe --always --tags
OUTPUT_VARIABLE git_tag OUTPUT_VARIABLE git_tag
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY ${PX4_SOURCE_DIR} WORKING_DIRECTORY ${PX4_SOURCE_DIR}
) )
set(version_major 1)
set(version_minor 5)
set(version_patch 0)
set(version "${version_major}.${version_minor}.${version_patch}")
set(package-contact "px4users@googlegroups.com") set(package-contact "px4users@googlegroups.com")
message(STATUS "PX4 VERSION: ${version}")
#============================================================================= #=============================================================================
# find programs and packages # find programs and packages

8
Makefile
View File

@ -260,11 +260,9 @@ format:
check_%: check_%:
@echo @echo
$(call colorecho,"Building" $(subst check_,,$@)) $(call colorecho,"Building" $(subst check_,,$@))
@$(MAKE) --no-print-directory $(subst check_,,$@) @$(MAKE) --no-print-directory $(subst check_,,$@) package
@mkdir -p Binaries @mkdir -p Packages
@mkdir -p Meta/$(subst check_,,$@) @cp build_$(subst check_,,$@)/*.zip Packages
@cp build_$(subst check_,,$@)/*.xml Meta/$(subst check_,,$@) 2> /dev/null || :
@find build_$(subst check_,,$@)/src/firmware -type f -name 'nuttx-*-default.px4' -exec cp "{}" Binaries \; 2> /dev/null || :
@rm -rf build_$(subst check_,,$@) @rm -rf build_$(subst check_,,$@)
@echo @echo