File movit-1.2.0-use-gtest-shared-library.patch of Package movit

Overview Repositories Revisions Requests Users Attributes Meta

File movit-1.2.0-use-gtest-shared-library.patch of Package movit (Revision 7085ea0eee736d8776b29ce4dadc84b3)

Currently displaying revision 7085ea0eee736d8776b29ce4dadc84b3 , Show latest

diff -up Makefile.in.orig Makefile.in
--- Makefile.in.orig	2015-12-21 18:42:02.719955476 +0100
+++ Makefile.in	2015-12-21 18:44:31.839949205 +0100
@@ -1,5 +1,3 @@
-GTEST_DIR ?= /usr/src/gtest
-
 # This will be upgraded for each release, although not necessarily for every git commit.
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 # for the rules as of how this is changed. This does not really mean that Movit will
@@ -22,13 +20,13 @@ with_coverage = @with_coverage@
 
 CC=@CC@
 CXX=@CXX@
-CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
+CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
 ifeq ($(with_SDL2),yes)
 CXXFLAGS += -DHAVE_SDL2
 endif
 LDFLAGS=@LDFLAGS@
 LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
-TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread
+TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread -lgtest
 DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
 SHELL=@SHELL@
 LIBTOOL=@LIBTOOL@ --tag=CXX
@@ -99,19 +97,16 @@ all: demo
 endif
 
 # Google Test and other test library functions.
-OWN_TEST_OBJS = gtest_sdl_main.o test_util.o
-TEST_OBJS = gtest-all.o $(OWN_TEST_OBJS)
+TEST_OBJS = gtest_sdl_main.o test_util.o
 
-gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
-	$(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
 gtest_sdl_main.o: gtest_sdl_main.cpp
-	$(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
+	$(CXX) -MMD $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
 
 # Unit tests.
 $(TESTS): %: %.o $(TEST_OBJS) libmovit.la
 	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
 
-OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o)
+OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 
 # A small demo program.

Places

File movit-1.2.0-use-gtest-shared-library.patch of Package movit (Revision 7085ea0eee736d8776b29ce4dadc84b3)

Places