diff options
| author | misterg <misterg@google.com> | 2019-02-20 18:32:08 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-20 18:35:36 (GMT) |
| commit | 873e479817d3e676416f761edb6be45dd601637f (patch) | |
| tree | 4e7f029dce4576eb87554bf58de0d43d06dc4ea2 /googlemock | |
| parent | 0e424c7594dd145188267c82db19f0e478df192d (diff) | |
| download | googletest-873e479817d3e676416f761edb6be45dd601637f.zip googletest-873e479817d3e676416f761edb6be45dd601637f.tar.gz googletest-873e479817d3e676416f761edb6be45dd601637f.tar.bz2 | |
Googletest export
Internal Change
PiperOrigin-RevId: 234823465
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/Makefile.am | 2 | ||||
| -rw-r--r-- | googlemock/configure.ac | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/googlemock/Makefile.am b/googlemock/Makefile.am index 6a5651c..8e0128f 100644 --- a/googlemock/Makefile.am +++ b/googlemock/Makefile.am @@ -133,7 +133,6 @@ EXTRA_DIST += \ make/Makefile # Pump scripts for generating Google Mock headers. -# TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump. EXTRA_DIST += \ include/gmock/gmock-generated-actions.h.pump \ include/gmock/gmock-generated-function-mockers.h.pump \ @@ -188,7 +187,6 @@ if HAVE_PYTHON # generated. $(test_gmock_fused_test_SOURCES): fused-gmock-internal -# TODO(vladl@google.com): Find a way to add Google Tests's sources here. fused-gmock-internal: $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) \ $(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES) \ $(lib_libgmock_main_la_SOURCES) \ diff --git a/googlemock/configure.ac b/googlemock/configure.ac index cb5e1a6..9456c3d 100644 --- a/googlemock/configure.ac +++ b/googlemock/configure.ac @@ -24,19 +24,12 @@ AC_PROG_CXX AC_LANG([C++]) AC_PROG_LIBTOOL -# TODO(chandlerc@google.com): Currently we aren't running the Python tests -# against the interpreter detected by AM_PATH_PYTHON, and so we condition -# HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's -# version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env" -# hashbang. PYTHON= # We *do not* allow the user to specify a python interpreter AC_PATH_PROG([PYTHON],[python],[:]) AS_IF([test "$PYTHON" != ":"], [AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])]) AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"]) -# TODO(chandlerc@google.com) Check for the necessary system headers. - # Configure pthreads. AC_ARG_WITH([pthreads], [AS_HELP_STRING([--with-pthreads], @@ -83,10 +76,7 @@ dependency upon GoogleTest to build, please provide a version, or allow GoogleMock to use any installed version and fall back upon its internal version.])]) -# Setup various GTEST variables. TODO(chandlerc@google.com): When these are -# used below, they should be used such that any pre-existing values always -# trump values we set them to, so that they can be used to selectively override -# details of the detection process. +# Setup various GTEST variables. AC_ARG_VAR([GTEST_CONFIG], [The exact path of Google Test's 'gtest-config' script.]) AC_ARG_VAR([GTEST_CPPFLAGS], @@ -139,8 +129,5 @@ AS_IF([test "x${HAVE_BUILT_GTEST}" = "xyes"], GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la' GTEST_VERSION="${GTEST_MIN_VERSION}"]) -# TODO(chandlerc@google.com) Check the types, structures, and other compiler -# and architecture characteristics. - # Output the generated files. No further autoconf macros may be used. AC_OUTPUT |