fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 04:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev_ros

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Thomas Gubler
2015-01-07 16:00:59 +01:00
parent 417a82c699 6ed2f77ca5
commit fe279d340d
17 changed files with 503 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -257,6 +257,7 @@ testbuild:
tests:
$(Q) $(MAKE) generateuorbtopicheaders
$(Q) (cd $(PX4_BASE)/unittests && $(MAKE) unittests)
$(Q) (mkdir -p $(PX4_BASE)/unittests/build && cd $(PX4_BASE)/unittests/build && cmake .. && $(MAKE) unittests)
#
# Cleanup targets. 'clean' should remove all built products and force