diff options
| author | Ted Gould <ted@gould.cx> | 2012-04-25 15:24:26 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-04-25 15:24:26 -0500 |
| commit | 4636768621434e40918be355637ab6e1920ef2ba (patch) | |
| tree | d61e3982c09c776a7519be6a028feb4e1cf80af2 | |
| parent | 62a010afdc5c7c30db3484df181ba84de7f8912d (diff) | |
| download | ayatana-ido-4636768621434e40918be355637ab6e1920ef2ba.tar.gz ayatana-ido-4636768621434e40918be355637ab6e1920ef2ba.tar.bz2 ayatana-ido-4636768621434e40918be355637ab6e1920ef2ba.zip | |
Bring in xorg-gtest to get an X11 wrapper
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 648c056..6e350b9 100644 --- a/configure.ac +++ b/configure.ac @@ -133,6 +133,7 @@ dnl = Google Test Framework =================================================== m4_include([m4/gtest.m4]) CHECK_GTEST +CHECK_XORG_GTEST dnl = GTK Doc Check =========================================================== diff --git a/tests/Makefile.am b/tests/Makefile.am index 03429c7..04e6cde 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,14 +19,15 @@ AM_CPPFLAGS = \ ############################# nodist_libgtest_a_SOURCES = \ + $(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp \ $(GTEST_SOURCE)/src/gtest-all.cc \ - $(GTEST_SOURCE)/src/gtest_main.cc + $(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp libgtest_a_CPPFLAGS = \ + $(XORG_GTEST_CPPFLAGS) \ + $(AM_CPPFLAGS) \ $(GTEST_CPPFLAGS) -w libgtest_a_CXXFLAGS = \ $(AM_CXXFLAGS) -libgtest_a_CPPFLAGS = \ - $(AM_CPPFLAGS) ############################# # Menuitem tests |