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

Makefile: don't do any git submodule magic

Browse Source 
Let's do all the submodule stuff in check_submodules.sh
This commit is contained in:
Julian Oes
2016-02-23 17:03:30 +01:00
committed by Lorenz Meier
parent 5af9dc280f
commit 23171b97fb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -2
View File
@@ -109,7 +109,7 @@ endif
# describe how to build a cmake config # describe how to build a cmake config
define cmake-build define cmake-build
+@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(PWD)/build_$@/Makefile ]; then rm -rf $(PWD)/build_$@; fi +@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(PWD)/build_$@/Makefile ]; then rm -rf $(PWD)/build_$@; fi
+@if [ ! -e $(PWD)/build_$@/CMakeCache.txt ]; then git submodule sync && git submodule update --init --recursive && mkdir -p $(PWD)/build_$@ && cd $(PWD)/build_$@ && cmake .. -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1); fi +@if [ ! -e $(PWD)/build_$@/CMakeCache.txt ]; then mkdir -p $(PWD)/build_$@ && cd $(PWD)/build_$@ && cmake .. -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1); fi
+Tools/check_submodules.sh +Tools/check_submodules.sh
+$(PX4_MAKE) -C $(PWD)/build_$@ $(PX4_MAKE_ARGS) $(ARGS) +$(PX4_MAKE) -C $(PWD)/build_$@ $(PX4_MAKE_ARGS) $(ARGS)
endef endef
@@ -169,7 +169,7 @@ qurt_eagle_default:
posix_eagle_default: posix_eagle_default:
$(call cmake-build,$@) $(call cmake-build,$@)
posix_rpi2_default: posix_rpi2_default:
$(call cmake-build,$@) $(call cmake-build,$@)