Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
873e4798
Commit
873e4798
authored
Feb 20, 2019
by
misterg
Committed by
Gennadiy Civil
Feb 20, 2019
Browse files
Googletest export
Internal Change PiperOrigin-RevId: 234823465
parent
0e424c75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
16 deletions
+1
-16
googlemock/Makefile.am
googlemock/Makefile.am
+0
-2
googlemock/configure.ac
googlemock/configure.ac
+1
-14
No files found.
googlemock/Makefile.am
View file @
873e4798
...
@@ -133,7 +133,6 @@ EXTRA_DIST += \
...
@@ -133,7 +133,6 @@ EXTRA_DIST += \
make/Makefile
make/Makefile
# Pump scripts for generating Google Mock headers.
# Pump scripts for generating Google Mock headers.
# TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
EXTRA_DIST
+=
\
EXTRA_DIST
+=
\
include/gmock/gmock-generated-actions.h.pump
\
include/gmock/gmock-generated-actions.h.pump
\
include/gmock/gmock-generated-function-mockers.h.pump
\
include/gmock/gmock-generated-function-mockers.h.pump
\
...
@@ -188,7 +187,6 @@ if HAVE_PYTHON
...
@@ -188,7 +187,6 @@ if HAVE_PYTHON
# generated.
# generated.
$(test_gmock_fused_test_SOURCES)
:
fused-gmock-internal
$(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)
\
fused-gmock-internal
:
$(pkginclude_HEADERS) $(pkginclude_internal_HEADERS)
\
$(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES)
\
$(lib_libgmock_la_SOURCES) $(GMOCK_SOURCE_INGLUDES)
\
$(lib_libgmock_main_la_SOURCES)
\
$(lib_libgmock_main_la_SOURCES)
\
...
...
googlemock/configure.ac
View file @
873e4798
...
@@ -24,19 +24,12 @@ AC_PROG_CXX
...
@@ -24,19 +24,12 @@ AC_PROG_CXX
AC_LANG([C++])
AC_LANG([C++])
AC_PROG_LIBTOOL
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
PYTHON= # We *do not* allow the user to specify a python interpreter
AC_PATH_PROG([PYTHON],[python],[:])
AC_PATH_PROG([PYTHON],[python],[:])
AS_IF([test "$PYTHON" != ":"],
AS_IF([test "$PYTHON" != ":"],
[AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])])
[AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])])
AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"])
AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"])
# TODO(chandlerc@google.com) Check for the necessary system headers.
# Configure pthreads.
# Configure pthreads.
AC_ARG_WITH([pthreads],
AC_ARG_WITH([pthreads],
[AS_HELP_STRING([--with-pthreads],
[AS_HELP_STRING([--with-pthreads],
...
@@ -83,10 +76,7 @@ dependency upon GoogleTest to build, please provide a version, or allow
...
@@ -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
GoogleMock to use any installed version and fall back upon its internal
version.])])
version.])])
# Setup various GTEST variables. TODO(chandlerc@google.com): When these are
# Setup various GTEST variables.
# 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.
AC_ARG_VAR([GTEST_CONFIG],
AC_ARG_VAR([GTEST_CONFIG],
[The exact path of Google Test's 'gtest-config' script.])
[The exact path of Google Test's 'gtest-config' script.])
AC_ARG_VAR([GTEST_CPPFLAGS],
AC_ARG_VAR([GTEST_CPPFLAGS],
...
@@ -139,8 +129,5 @@ AS_IF([test "x${HAVE_BUILT_GTEST}" = "xyes"],
...
@@ -139,8 +129,5 @@ AS_IF([test "x${HAVE_BUILT_GTEST}" = "xyes"],
GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la'
GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la'
GTEST_VERSION="${GTEST_MIN_VERSION}"])
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.
# Output the generated files. No further autoconf macros may be used.
AC_OUTPUT
AC_OUTPUT
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment