diff options
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | gtest.patch | 11 |
2 files changed, 7 insertions, 9 deletions
@@ -36,9 +36,8 @@ apps/makescene/makescene apps/sceneupgrade/sceneupgrade" prepare() { - cd ${srcdir} - patch -Np1 -i gtest.patch - cd ${pkgname} + cd ${srcdir}/${pkgname} + git apply -v ${srcdir}/gtest.patch sed -i '/CXXFLAGS*/s/$/ -msse4.2/' libs/sfm/Makefile } 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: - |