Browse Source

CMake / Ninja: Use console flag so upload targets can print their normal output and receive input.

sbg
Lorenz Meier 9 years ago
parent
commit
aff78e0f5e
  1. 3
      Makefile
  2. 1
      cmake/common/px4_base.cmake
  3. 1
      src/firmware/posix/CMakeLists.txt

3
Makefile

@ -68,7 +68,7 @@ ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS)) @@ -68,7 +68,7 @@ ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
j ?= 4
# disable ninja by default for now because it hides upload progress
#NINJA_BUILD := $(shell ninja --version 2>/dev/null)
NINJA_BUILD := $(shell ninja --version 2>/dev/null)
ifdef NINJA_BUILD
PX4_CMAKE_GENERATOR ?= "Ninja"
PX4_MAKE = ninja
@ -89,6 +89,7 @@ endif @@ -89,6 +89,7 @@ endif
# --------------------------------------------------------------------
# describe how to build a cmake config
define cmake-build
+@if [ $(PX4_CMAKE_GENERATOR) == "Ninja" ] && [ -e $(PWD)/build_$@/Makefile ]; then rm -rf $(PWD)/build_$@; fi
+@if [ ! -e $(PWD)/build_$@/CMakeCache.txt ]; then git submodule update --init --recursive --force && mkdir -p $(PWD)/build_$@ && cd $(PWD)/build_$@ && cmake .. -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1); fi
+$(PX4_MAKE) -C $(PWD)/build_$@ $(PX4_MAKE_ARGS) $(ARGS)
endef

1
cmake/common/px4_base.cmake

@ -433,6 +433,7 @@ function(px4_add_upload) @@ -433,6 +433,7 @@ function(px4_add_upload)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "uploading ${BUNDLE}"
VERBATIM
USES_TERMINAL
)
endfunction()

1
src/firmware/posix/CMakeLists.txt

@ -28,6 +28,7 @@ add_custom_target(run_sitl @@ -28,6 +28,7 @@ add_custom_target(run_sitl
COMMAND Tools/sitl_run.sh "${config_sitl_rcS}" "${config_sitl_debugger}"
"${config_sitl_viewer}" "${CMAKE_BINARY_DIR}"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
USES_TERMINAL
)
add_dependencies(run_sitl mainapp)

Loading…
Cancel
Save