mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Add support for gtest 1.6

Browse source 
1.6.0 removed support for 'make install' as the maintainers are
apparently unaware that their library is not actually a unique snowflake
and that having to use identical compilation settings for every library
is in fact a completely normal thing for C++ libraries that people
somehow manage to deal with.

Building the tests now requires passing the root directory of a copy of
the googletest source to make, via 'make GTEST_ROOT=~/path/to/gtest'.
This commit is contained in:
Thomas Goyne 2012-11-07 07:37:46 -08:00
parent 4853119153
commit 9c37a50b4d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/tests/Makefile
View file

@ -3,10 +3,10 @@ include ../Makefile.inc
PROGRAM = run
LIBS += -L../libaegisub -laegisub -lgtest -L../universalchardet -luniversalchardet
LIBS += -L../libaegisub -laegisub -L../universalchardet -luniversalchardet
LDFLAGS += -Wl,-rpath $(CURDIR)/../libaegisub $(LDFLAGS_ICONV)
CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV)
CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) -I${GTEST_ROOT} -I${GTEST_ROOT}/include
CXXFLAGS += -Wno-unused-value
ifeq (yes, $(BUILD_DARWIN))
@ -32,7 +32,8 @@ SRC = \
libaegisub_thesaurus.cpp \
libaegisub_util.cpp \
libaegisub_vfr.cpp \
libaegisub_word_split.cpp
libaegisub_word_split.cpp \
${GTEST_ROOT}/src/gtest-all.cc
HEADER = \
*.h