diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-10-03 09:14:02 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-10-10 08:23:33 +1000 |
| commit | d4873441a0afc083963a392ad422e3187e60a159 (patch) | |
| tree | 61c064cc0152eb85968e08fd67ac134be0fc009a /src | |
| parent | 34847188b63dccf3a9c2f49242eb42b5b3e9d642 (diff) | |
Fix up build system to use the googletest import build
Drop the CHECK_GTEST macro, we can assume it's there now. We
still build the gtest bits as convenience libraries, leave the various flags
in there.
Add $includedir/xorg to pgkconfig CPPFLAGS, as we install gtest.h in
includedir/xorg/gtest/gtest.h to avoid overwriting or conflicts with a
system-installed gtest.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile-xorg-gtest.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile-xorg-gtest.am b/src/Makefile-xorg-gtest.am index 4f36b13..c7c96d8 100644 --- a/src/Makefile-xorg-gtest.am +++ b/src/Makefile-xorg-gtest.am @@ -26,14 +26,16 @@ XORG_GTEST_BUILD_LIBS = \ libxorg-gtest.a \ libxorg-gtest_main.a +GTEST_CPPFLAGS=-I$(XORG_GTEST_SOURCE)/src/gtest + # Here and below we compile without warnings (-w) because the projects using # xorg-gtest will not want to see warnings or fail to build due to warnings in # gtest or xorg-gtest. -nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc +nodist_libgtest_a_SOURCES = $(XORG_GTEST_SOURCE)/src/gtest/gtest-all.cc libgtest_a_CPPFLAGS = $(GTEST_CPPFLAGS) $(AM_CPPFLAGS) -w libgtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS) -nodist_libgtest_main_a_SOURCES = $(GTEST_SOURCE)/src/gtest_main.cc +nodist_libgtest_main_a_SOURCES = $(XORG_GTEST_SOURCE)/src/gtest/gtest_main.cc libgtest_main_a_CPPFLAGS = $(GTEST_CPPFLAGS) $(AM_CPPFLAGS) -w libgtest_main_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS) |