diff options
| author | Simon Newton <nomis52@gmail.com> | 2015-09-17 08:33:43 -0700 |
|---|---|---|
| committer | Simon Newton <nomis52@gmail.com> | 2015-09-17 08:33:43 -0700 |
| commit | 39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae (patch) | |
| tree | 9f346d9bfb4c5769d59159ef812c7c00edeecd33 /googlemock | |
| parent | de411c3e80120f8dcc2a3f4f62f3ca692c0431d7 (diff) | |
| download | googletest-39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae.tar.gz googletest-39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae.tar.bz2 googletest-39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae.zip | |
Fix the googlemock autotools build.
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/configure.ac | 10 | ||||
| -rwxr-xr-x | googlemock/scripts/fuse_gmock_files.py | 10 | ||||
| -rw-r--r-- | googlemock/test/gmock_test.cc | 1 |
3 files changed, 10 insertions, 11 deletions
diff --git a/googlemock/configure.ac b/googlemock/configure.ac index d268d5d7..3b740f20 100644 --- a/googlemock/configure.ac +++ b/googlemock/configure.ac @@ -1,4 +1,4 @@ -m4_include(gtest/m4/acx_pthread.m4) +m4_include(../googletest/m4/acx_pthread.m4) AC_INIT([Google C++ Mocking Framework], [1.7.0], @@ -129,14 +129,14 @@ AS_IF([test "x${HAVE_BUILT_GTEST}" = "xyes"], GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` GTEST_LIBS=`${GTEST_CONFIG} --libs` GTEST_VERSION=`${GTEST_CONFIG} --version`], - [AC_CONFIG_SUBDIRS([gtest]) + [AC_CONFIG_SUBDIRS([../googletest]) # GTEST_CONFIG needs to be executable both in a Makefile environmont and # in a shell script environment, so resolve an absolute path for it here. - GTEST_CONFIG="`pwd -P`/gtest/scripts/gtest-config" - GTEST_CPPFLAGS='-I$(top_srcdir)/gtest/include' + GTEST_CONFIG="`pwd -P`/../googletest/scripts/gtest-config" + GTEST_CPPFLAGS='-I$(top_srcdir)/../googletest/include' GTEST_CXXFLAGS='-g' GTEST_LDFLAGS='' - GTEST_LIBS='$(top_builddir)/gtest/lib/libgtest.la' + GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la' GTEST_VERSION="${GTEST_MIN_VERSION}"]) # TODO(chandlerc@google.com) Check the types, structures, and other compiler diff --git a/googlemock/scripts/fuse_gmock_files.py b/googlemock/scripts/fuse_gmock_files.py index fc0baf79..cb7fdf2f 100755 --- a/googlemock/scripts/fuse_gmock_files.py +++ b/googlemock/scripts/fuse_gmock_files.py @@ -36,8 +36,8 @@ SYNOPSIS fuse_gmock_files.py [GMOCK_ROOT_DIR] OUTPUT_DIR Scans GMOCK_ROOT_DIR for Google Mock and Google Test source - code, assuming Google Test is in the GMOCK_ROOT_DIR/gtest - sub-directory, and generates three files: + code, assuming Google Test is in the GMOCK_ROOT_DIR/../googletest + directory, and generates three files: OUTPUT_DIR/gtest/gtest.h, OUTPUT_DIR/gmock/gmock.h, and OUTPUT_DIR/gmock-gtest-all.cc. Then you can build your tests by adding OUTPUT_DIR to the include search path and linking @@ -70,8 +70,8 @@ import sys # Mock root directory. DEFAULT_GMOCK_ROOT_DIR = os.path.join(os.path.dirname(__file__), '..') -# We need to call into gtest/scripts/fuse_gtest_files.py. -sys.path.append(os.path.join(DEFAULT_GMOCK_ROOT_DIR, 'gtest/scripts')) +# We need to call into googletest/scripts/fuse_gtest_files.py. +sys.path.append(os.path.join(DEFAULT_GMOCK_ROOT_DIR, '../googletest/scripts')) import fuse_gtest_files gtest = fuse_gtest_files @@ -91,7 +91,7 @@ GMOCK_GTEST_ALL_CC_OUTPUT = 'gmock-gtest-all.cc' def GetGTestRootDir(gmock_root): """Returns the root directory of Google Test.""" - return os.path.join(gmock_root, 'gtest') + return os.path.join(gmock_root, '../googletest') def ValidateGMockRootDir(gmock_root): diff --git a/googlemock/test/gmock_test.cc b/googlemock/test/gmock_test.cc index ae5e22c8..d8d0c57b 100644 --- a/googlemock/test/gmock_test.cc +++ b/googlemock/test/gmock_test.cc @@ -37,7 +37,6 @@ #include <string> #include "gtest/gtest.h" -#include "gtest/internal/custom/gtest.h" #if !defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) |