cmake cleanup nuttx dependency handling (#7007)

- closes #6501
 - closes #6820
 - closes #6881
This commit is contained in:
Daniel Agar
2017-04-17 20:57:35 -04:00
committed by GitHub
parent f460f5b34c
commit 3721fb9d52
6 changed files with 214 additions and 98 deletions
+24 -2
View File
@@ -81,7 +81,12 @@ endif
ifdef NINJA_BUILD
PX4_CMAKE_GENERATOR := Ninja
PX4_MAKE := $(NINJA_BIN)
PX4_MAKE_ARGS :=
ifdef VERBOSE
PX4_MAKE_ARGS := -v
else
PX4_MAKE_ARGS :=
endif
else
ifdef SYSTEMROOT
# Windows
@@ -102,6 +107,17 @@ else
BUILD_DIR_SUFFIX :=
endif
# NuttX verbose output
ifdef VN
export PX4_NUTTX_BUILD_VERBOSE=1
export V=1
endif
# NuttX verbose patches output
ifdef VNP
export PX4_NUTTX_PATCHES_VERBOSE=1
endif
# additional config parameters passed to cmake
CMAKE_ARGS :=
ifdef EXTERNAL_MODULES_LOCATION
@@ -327,10 +343,16 @@ clean:
-@$(MAKE) --no-print-directory -C NuttX/nuttx clean
submodulesclean:
@git submodule foreach --quiet --recursive git clean -ff -x -d
@git submodule update --quiet --init --recursive --force || true
@git submodule sync --recursive
@git submodule deinit -f .
@git submodule update --init --recursive --force
submodulesupdate:
@git submodule update --quiet --init --recursive || true
@git submodule sync --recursive
@git submodule update --init --recursive
gazeboclean:
@rm -rf ~/.gazebo/*