Skip to content
Snippets Groups Projects

googletest integration

Closed Alexandre Fernandez requested to merge Nerf/medialibrary:master into master
4 files
+ 45
8
Compare changes
  • Side-by-side
  • Inline
Files
4
+ 8
6
@@ -238,14 +238,14 @@ check_PROGRAMS = unittest samples
lib_LTLIBRARIES += libgtest.la libgtestmain.la
libgtest_la_SOURCES = \
googletest/src/gtest-all.cc
googletest/googletest/src/gtest-all.cc
libgtestmain_la_SOURCES = \
googletest/src/gtest_main.cc
googletest/googletest/src/gtest_main.cc
libgtest_la_CPPFLAGS = \
-I$(top_srcdir)/googletest \
-I$(top_srcdir)/googletest/include
-I$(top_srcdir)/googletest/googletest \
-I$(top_srcdir)/googletest/googletest/include
if HAVE_PTHREAD
libgtest_la_CPPFLAGS += -DGTEST_HAS_PTHREAD=1
@@ -290,7 +290,7 @@ unittest_SOURCES = \
unittest_CPPFLAGS = \
$(MEDIALIB_CPPFLAGS) \
-I$(top_srcdir)/test \
-I$(top_srcdir)/googletest/include \
-I$(top_srcdir)/googletest/googletest/include \
$(SQLITE_CFLAGS) \
$(VLCPP_CFLAGS) \
$(VLC_CFLAGS) \
@@ -314,7 +314,7 @@ samples_CPPFLAGS = \
$(MEDIALIB_CPPFLAGS) \
-DSRC_DIR=\"$(abs_srcdir)\" \
-I$(top_srcdir)/test \
-I$(top_srcdir)/googletest/include \
-I$(top_srcdir)/googletest/googletest/include \
$(SQLITE_CFLAGS) \
$(RAPIDJSON_CFLAGS) \
$(VLCPP_CFLAGS) \
@@ -329,6 +329,8 @@ samples_LDADD = \
$(SQLITE_LIBS) \
$(NULL)
TESTS = unittest samples
endif
pkgconfigdir = $(libdir)/pkgconfig
Loading