rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

This upgrades google test to 1.7.0 and fixes some issues in make files.

Browse Source
This commit is contained in:
Fredrik Arvidsson 2016-01-31 22:04:59 +01:00
parent 07a9042832
commit b6a3a32ce4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flight/make/unittest.mk
View File

@ -39,6 +39,9 @@ ALLOBJ := $(addprefix $(OUTDIR)/, $(addsuffix .o, $(ALLSRCBASE)))
$(foreach src,$(ALLSRC),$(eval $(call COMPILE_C_TEMPLATE,$(src))))
$(foreach src,$(ALLCPPSRC),$(eval $(call COMPILE_CXX_TEMPLATE,$(src))))
# Specific extensions to CPPFLAGS only for the google test library
$(OUTDIR)/gtest-all.o: CPPFLAGS += -I$(GTEST_SRC_DIR)/..
$(eval $(call COMPILE_CXX_TEMPLATE, $(GTEST_SRC_DIR)/gtest-all.cc))
$(eval $(call LINK_CXX_TEMPLATE,$(OUTDIR)/$(TARGET).elf,$(ALLOBJ) $(OUTDIR)/gtest-all.o))
@ -46,7 +49,7 @@ $(eval $(call LINK_CXX_TEMPLATE,$(OUTDIR)/$(TARGET).elf,$(ALLOBJ) $(OUTDIR)/gtes
CPPFLAGS += -I$(GTEST_DIR)/include
# Flags passed to the C++ compiler
CXXFLAGS += -g -Wall -Wextra
CXXFLAGS += -g -Wall -Wextra -Wno-missing-field-initializers
# Flags passed to the C compiler
CONLYFLAGS += -std=gnu99

4
make/tools.mk
View File

@ -120,7 +120,7 @@ else ifeq ($(UNAME), Windows)
DOXYGEN_URL := http://librepilot.github.io/tools/doxygen-1.8.3.1-windows.tar.bz2
endif
GTEST_URL := http://librepilot.github.io/tools/gtest-1.6.0.zip
GTEST_URL := http://librepilot.github.io/tools/gtest-1.7.0.zip
CCACHE_URL := http://samba.org/ftp/ccache/ccache-3.2.2.tar.bz2
CCACHE_MD5_URL := http://librepilot.github.io/tools/ccache-3.2.2.tar.bz2.md5
@ -128,7 +128,7 @@ QT_VERSION := 5.5.1
QT_SDK_DIR := $(TOOLS_DIR)/qt-$(QT_VERSION)
UNCRUSTIFY_DIR := $(TOOLS_DIR)/uncrustify-0.60
DOXYGEN_DIR := $(TOOLS_DIR)/doxygen-1.8.3.1
GTEST_DIR := $(TOOLS_DIR)/gtest-1.6.0
GTEST_DIR := $(TOOLS_DIR)/gtest-1.7.0
CCACHE_DIR := $(TOOLS_DIR)/ccache
OSG_TOOLS_DIR := $(TOOLS_DIR)