|
 |
ba2d735 |
--- configure.ac.orig 2020-05-26 17:38:35.000000000 -0600
|
|
|
ba2d735 |
+++ configure.ac 2020-07-02 08:53:13.868173299 -0600
|
|
|
874e012 |
@@ -54,7 +54,7 @@ AS_IF([test "$with_gtest" = "download"],
|
|
|
874e012 |
fi
|
|
|
874e012 |
])],
|
|
|
874e012 |
[test "$with_gtest" = "yes"], [
|
|
|
ba2d735 |
- AS_IF([test -e "$GTEST_PATH/src/gtest-all.cc"], [], [
|
|
|
ba2d735 |
+ AS_IF([test -e "$GTEST_PATH/include/gtest/gtest.h"], [], [
|
|
|
874e012 |
AC_MSG_ERROR([could not find gtest source at path $GTEST_PATH.])
|
|
|
874e012 |
])
|
|
|
874e012 |
],
|
|
|
7b1a34c |
@@ -62,7 +62,7 @@ AS_IF([test "$with_gtest" = "download"],
|
|
|
874e012 |
[AC_MSG_ERROR([invalid value $with_gtest for with_gtest.])]
|
|
|
874e012 |
)
|
|
|
874e012 |
AS_IF([test "$with_gtest" = "yes"],
|
|
|
7b1a34c |
- [CPPFLAGS="-I$GTEST_PATH/include -I$GTEST_PATH $CPPFLAGS"]);
|
|
|
7b1a34c |
+ [CPPFLAGS="-I$GTEST_PATH/include/gtest -I$GTEST_PATH $CPPFLAGS"]);
|
|
|
874e012 |
AM_CONDITIONAL(with_gtest, test "$with_gtest" = "yes")
|
|
|
874e012 |
|
|
|
874e012 |
DEPS_CFLAGS="$MEMTAILOR_CFLAGS $GTEST_CFLAGS"
|
|
|
ba2d735 |
--- src/test/gtestInclude.cpp.orig 2020-05-26 17:38:35.000000000 -0600
|
|
|
ba2d735 |
+++ src/test/gtestInclude.cpp 2020-07-02 08:52:35.084246541 -0600
|
|
|
874e012 |
@@ -7,4 +7,4 @@
|
|
|
874e012 |
|
|
|
874e012 |
// the .. goes back from the include/ directory of gtest so we can
|
|
|
874e012 |
// enter the src directory.
|
|
|
874e012 |
-#include "src/gtest-all.cc"
|
|
|
874e012 |
+#include <gtest/gtest.h>
|