rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

OP-1818 applied review comments

Browse Source
This commit is contained in:
Philippe Renon 2015-04-09 21:11:15 +02:00
parent bc3266d689
commit 1ef5d644b8
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -111,10 +111,8 @@ endif
# Include tools installers # Include tools installers
include $(ROOT_DIR)/make/tools.mk include $(ROOT_DIR)/make/tools.mk
# Include third party builders # Include third party builders if available
ifneq ("$(wildcard $(ROOT_DIR)/make/3rdparty/3rdparty.mk)","") -include $(ROOT_DIR)/make/3rdparty/3rdparty.mk
include $(ROOT_DIR)/make/3rdparty/3rdparty.mk
endif
# We almost need to consider autoconf/automake instead of this # We almost need to consider autoconf/automake instead of this
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)

7
make/tools.mk
View File

@ -932,10 +932,9 @@ gtest_version:
$(eval $(call TOOL_INSTALL_TEMPLATE,cmake,$(CMAKE_DIR),$(CMAKE_URL),$(CMAKE_MD5_URL),$(notdir $(CMAKE_URL)))) $(eval $(call TOOL_INSTALL_TEMPLATE,cmake,$(CMAKE_DIR),$(CMAKE_URL),$(CMAKE_MD5_URL),$(notdir $(CMAKE_URL))))
ifeq ($(shell [ -d "$(CMAKE_DIR)" ] && $(ECHO) "exists"), exists) ifeq ($(shell [ -d "$(CMAKE_DIR)" ] && $(ECHO) "exists"), exists)
export CMAKE := "$(CMAKE_DIR)/bin/cmake" export CMAKE := $(CMAKE_DIR)/bin/cmake
export PATH := $(CMAKE_DIR)/bin:$(PATH) export PATH := $(CMAKE_DIR)/bin:$(PATH)
else else
export CMAKE := "cmake"
# not installed, hope it's in the path... # not installed, hope it's in the path...
#$(info $(EMPTY) WARNING $(call toprel, $(CMAKE_DIR)) not found (make cmake_install), using system PATH) #$(info $(EMPTY) WARNING $(call toprel, $(CMAKE_DIR)) not found (make cmake_install), using system PATH)
export CMAKE := cmake export CMAKE := cmake
@ -943,7 +942,7 @@ endif
.PHONY: cmake_version .PHONY: cmake_version
cmake_version: cmake_version:
-$(V1) $(ECHO) "`$(CMAKE) --version`" -$(V1) $(CMAKE) --version
############################## ##############################
# #
@ -956,7 +955,7 @@ ifeq ($(UNAME), Windows)
$(eval $(call TOOL_INSTALL_TEMPLATE,msys,$(MSYS_DIR),$(MSYS_URL),,$(notdir $(MSYS_URL)))) $(eval $(call TOOL_INSTALL_TEMPLATE,msys,$(MSYS_DIR),$(MSYS_URL),,$(notdir $(MSYS_URL))))
ifeq ($(shell [ -d "$(MSYS_DIR)" ] && $(ECHO) "exists"), exists) ifeq ($(shell [ -d "$(MSYS_DIR)" ] && $(ECHO) "exists"), exists)
export MSYS_DIR := $(MSYS_DIR) export MSYS_DIR
else else
# not installed, hope it's in the path... # not installed, hope it's in the path...
#$(info $(EMPTY) WARNING $(call toprel, $(MSYS_DIR)) not found (make msys_install), using system PATH) #$(info $(EMPTY) WARNING $(call toprel, $(MSYS_DIR)) not found (make msys_install), using system PATH)