Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
e4f6c0b3
Commit
e4f6c0b3
authored
Sep 01, 2017
by
Gennadiy Civil
Committed by
GitHub
Sep 01, 2017
Browse files
Merge pull request #1011 from zeitounator/wrong-version-reported
Wrong version reported (1.7.0 should be 1.8.0)
parents
b3a1f87f
96f7ba83
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
googlemock/configure.ac
googlemock/configure.ac
+2
-2
googletest/configure.ac
googletest/configure.ac
+1
-1
No files found.
googlemock/configure.ac
View file @
e4f6c0b3
m4_include(../googletest/m4/acx_pthread.m4)
AC_INIT([Google C++ Mocking Framework],
[1.
7
.0],
[1.
8
.0],
[googlemock@googlegroups.com],
[gmock])
...
...
@@ -101,7 +101,7 @@ AC_ARG_VAR([GTEST_VERSION],
[The version of Google Test available.])
HAVE_BUILT_GTEST="no"
GTEST_MIN_VERSION="1.
7
.0"
GTEST_MIN_VERSION="1.
8
.0"
AS_IF([test "x${enable_external_gtest}" = "xyes"],
[# Begin filling in variables as we are able.
...
...
googletest/configure.ac
View file @
e4f6c0b3
...
...
@@ -5,7 +5,7 @@ m4_include(m4/acx_pthread.m4)
# "[1.0.1]"). It also asumes that there won't be any closing parenthesis
# between "AC_INIT(" and the closing ")" including comments and strings.
AC_INIT([Google C++ Testing Framework],
[1.
7
.0],
[1.
8
.0],
[googletestframework@googlegroups.com],
[gtest])
...
...
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