diff options
| author | bartus | 2019-09-01 13:50:25 +0200 |
|---|---|---|
| committer | bartus | 2019-09-01 13:50:25 +0200 |
| commit | 6c295dbda3c1e5e67c4faea8109c93610d29ed8c (patch) | |
| tree | e0c6931f93ffe995040aa1950a14ddb8311e1a2a /gtest.patch | |
| parent | 359f9127a510c410ac0f81aad1361d70f847da67 (diff) | |
| download | aur-6c295dbda3c1e5e67c4faea8109c93610d29ed8c.tar.gz | |
Fix gtest.patch.
Diffstat (limited to 'gtest.patch')
| -rw-r--r-- | gtest.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gtest.patch b/gtest.patch index 6e5e77ce5810..9494c2e48f42 100644 --- a/gtest.patch +++ b/gtest.patch @@ -1,17 +1,16 @@ diff --git a/tests/Makefile b/tests/Makefile -index f179d48..8927a5c 100644 ---- a/mve-git/tests/Makefile -+++ b/mve-git/tests/Makefile -@@ -7,9 +7,9 @@ SOURCES = $(wildcard math/gtest_*.cc) $(wildcard mve/gtest_*.cc) $(wildcard sfm/ +index d6d913f..9cb0080 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -8,9 +8,9 @@ SOURCES = $(wildcard math/gtest_*.cc) $(wildcard mve/gtest_*.cc) $(wildcard sfm/ INCLUDES = -I${MVE_ROOT}/libs -I${GTEST_PATH}/include CXXWARNINGS = -Wall -Wextra -pedantic -Wno-sign-compare CXXFLAGS = -std=c++11 -pthread ${CXXWARNINGS} ${INCLUDES} -LDLIBS += -lpng -ltiff -ljpeg +LDLIBS += -lpng -ltiff -ljpeg -lgtest -lgtest_main --test: ${SOURCES:.cc=.o} libmve_fssr.a libmve_sfm.a libmve.a libmve_util.a libgtest_main.a +-test: ${SOURCES:.cc=.o} libmve_fssr.a libmve_sfm.a libmve.a libmve_util.a libgtest_main.a libgtest.a +test: ${SOURCES:.cc=.o} libmve_fssr.a libmve_sfm.a libmve.a libmve_util.a ${LINK.cc} -o $@ $^ ${LDLIBS} clean: - |